diff --git a/build/ci-cd/validate-content-conversion-round-trips.sh b/build/ci-cd/validate-content-conversion-round-trips.sh
index fe0269a097..4a9431f448 100755
--- a/build/ci-cd/validate-content-conversion-round-trips.sh
+++ b/build/ci-cd/validate-content-conversion-round-trips.sh
@@ -249,7 +249,7 @@ process_paths() {
 
         case $source_format in
         xml)
-          result=$(python ${OSCALDIR}/build/ci-cd/python/xmlComparison.py "$roundtrip_file" "$source_file" 2>&1)
+          result=$(python3 ${OSCALDIR}/build/ci-cd/python/xmlComparison.py "$roundtrip_file" "$source_file" 2>&1)
           ;;
         json)
           result=$(json-diff "$source_file" "$roundtrip_file" 2>&1)
diff --git a/build/metaschema b/build/metaschema
index 3295d87d47..9ebf24aa42 160000
--- a/build/metaschema
+++ b/build/metaschema
@@ -1 +1 @@
-Subproject commit 3295d87d47265889a1f3e6e0bb23d331ce6ddabf
+Subproject commit 9ebf24aa42d2833c9199d0dd77f5a32382067f85
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 b53963a3ed..fde76116ce 100644
--- a/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl
+++ b/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl
@@ -83,14 +83,7 @@
    <xsl:template match="assessment-plan"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan"
-                _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/src/metaschema/oscal_assessment-plan_metaschema.xml"
-                _key-name="oscal-ap:assessment-plan"
-                _using-root-name="assessment-plan"
-                gi="assessment-plan">
+      <assembly name="assessment-plan" key="assessment-plan" gi="assessment-plan">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-plan</xsl:attribute>
          </xsl:if>
@@ -124,19 +117,7 @@
    <xsl:template match="metadata"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -201,18 +182,7 @@
    <xsl:template match="prop"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@ns"/>
@@ -224,18 +194,7 @@
    <xsl:template match="link"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
@@ -245,18 +204,7 @@
    <xsl:template match="role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -281,18 +229,7 @@
    <xsl:template match="location"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="address"/>
@@ -337,18 +274,7 @@
    <xsl:template match="party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="name"/>
@@ -415,18 +341,7 @@
    <xsl:template match="responsible-party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="party-uuid" group-by="true()">
             <group in-json="ARRAY" key="party-uuids">
@@ -455,19 +370,7 @@
    <xsl:template match="import-ssp"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/import-ssp"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:import-ssp"
-                _step="import-ssp"
-                _key="import-ssp"
-                _key-ref="oscal-assessment-common:import-ssp"
-                _using-name="import-ssp"
-                _in-xml-name="import-ssp"
-                _in-json-name="import-ssp"
-                gi="import-ssp">
+      <assembly name="import-ssp" key="import-ssp" gi="import-ssp">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-ssp</xsl:attribute>
          </xsl:if>
@@ -478,18 +381,7 @@
    <xsl:template match="component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-implementation-common:system-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="system-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -530,18 +422,7 @@
    <xsl:template match="responsible-role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -570,18 +451,7 @@
    <xsl:template match="protocol"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="title"/>
@@ -597,19 +467,7 @@
    <xsl:template match="port-range"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
          <xsl:apply-templates select="@end"/>
          <xsl:apply-templates select="@transport"/>
@@ -618,18 +476,7 @@
    <xsl:template match="inventory-item"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:inventory-item"
-                _step="inventory-item"
-                _key="inventory-items"
-                _key-ref="oscal-implementation-common:inventory-item"
-                _using-name="inventory-item"
-                _in-xml-name="inventory-item"
-                _in-json-name="inventory-items"
-                gi="inventory-item">
+      <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -666,18 +513,7 @@
    <xsl:template match="user"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-user"
-                _step="user"
-                _key="users"
-                _key-ref="oscal-implementation-common:system-user"
-                _using-name="user"
-                _in-xml-name="user"
-                _in-json-name="users"
-                gi="user">
+      <assembly name="system-user" gi="user">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -716,18 +552,7 @@
    <xsl:template match="authorized-privilege"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:authorized-privilege"
-                _step="authorized-privilege"
-                _key="authorized-privileges"
-                _key-ref="oscal-implementation-common:authorized-privilege"
-                _using-name="authorized-privilege"
-                _in-xml-name="authorized-privilege"
-                _in-json-name="authorized-privileges"
-                gi="authorized-privilege">
+      <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="function-performed" group-by="true()">
@@ -742,18 +567,7 @@
    <xsl:template match="objectives-and-methods"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:local-objective"
-                _step="objectives-and-methods"
-                _key="objectives-and-methods"
-                _key-ref="oscal-assessment-common:local-objective"
-                _using-name="objectives-and-methods"
-                _in-xml-name="objectives-and-methods"
-                _in-json-name="objectives-and-methods"
-                gi="objectives-and-methods">
+      <assembly name="local-objective" gi="objectives-and-methods">
          <xsl:apply-templates select="@control-id"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -783,18 +597,7 @@
    <xsl:template match="objectives-and-methods/part | objectives-and-methods/part//part"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-catalog-common:part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="part" gi="part">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@ns"/>
@@ -810,21 +613,14 @@
          <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">
+                   key="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-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -849,18 +645,7 @@
    <xsl:template match="terms-and-conditions/part | terms-and-conditions/part//part"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-assessment-common:assessment-part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="assessment-part" gi="part">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@ns"/>
@@ -876,21 +661,14 @@
          <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">
+                   key="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-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -915,18 +693,7 @@
    <xsl:template match="activity"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:activity"
-                _step="activity"
-                _key="activities"
-                _key-ref="oscal-assessment-common:activity"
-                _using-name="activity"
-                _in-xml-name="activity"
-                _in-json-name="activities"
-                gi="activity">
+      <assembly name="activity" gi="activity">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -965,18 +732,8 @@
    <xsl:template match="reviewed-controls"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/reviewed-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="reviewed-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="reviewed-controls"
-                _in-xml-name="reviewed-controls"
-                _in-json-name="reviewed-controls"
                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
@@ -1017,17 +774,7 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="include-objective"
-                _key="include-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="include-objective"
-                _in-xml-name="include-objective"
-                _in-json-name="include-objectives"
                 gi="include-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
@@ -1036,17 +783,7 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="exclude-objective"
-                _key="exclude-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="exclude-objective"
-                _in-xml-name="exclude-objective"
-                _in-json-name="exclude-objectives"
                 gi="exclude-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
@@ -1054,18 +791,8 @@
    <xsl:template match="related-controls"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/related-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="related-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="related-controls"
-                _in-xml-name="related-controls"
-                _in-json-name="related-controls"
                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
@@ -1105,18 +832,7 @@
    <xsl:template match="assessment-subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="assessment-subject"
-                _key="assessment-subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="assessment-subject"
-                _in-xml-name="assessment-subject"
-                _in-json-name="assessment-subjects"
-                gi="assessment-subject">
+      <assembly name="assessment-subject" gi="assessment-subject">
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1154,18 +870,7 @@
    <xsl:template match="include-subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="include-subject"
-                _key="include-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="include-subject"
-                _in-xml-name="include-subject"
-                _in-json-name="include-subjects"
-                gi="include-subject">
+      <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1188,18 +893,7 @@
    <xsl:template match="exclude-subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="exclude-subject"
-                _key="exclude-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="exclude-subject"
-                _in-xml-name="exclude-subject"
-                _in-json-name="exclude-subjects"
-                gi="exclude-subject">
+      <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1222,18 +916,8 @@
    <xsl:template match="assessment-assets"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
-                name="assessment-assets"
+      <assembly name="assessment-assets"
                 key="assessment-assets"
-                _base-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"
-                _key-ref="oscal-assessment-common:assessment-assets"
-                _using-name="assessment-assets"
-                _in-xml-name="assessment-assets"
-                _in-json-name="assessment-assets"
                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
@@ -1257,18 +941,7 @@
    <xsl:template match="task"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="task"
-                _in-xml-name="task"
-                _in-json-name="tasks"
-                gi="task">
+      <assembly name="task" gi="task">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -1329,18 +1002,7 @@
    <xsl:template match="subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1378,19 +1040,7 @@
    <xsl:template match="back-matter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -1406,21 +1056,11 @@
    <xsl:template match="remarks"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1437,19 +1077,9 @@
    <xsl:template match="location-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -1460,19 +1090,9 @@
    <xsl:template match="party-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -1483,19 +1103,9 @@
    <xsl:template match="role-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/role-id"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/role-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="role-id"
-             _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"
-             _key-ref="oscal-metadata:role-id"
-             _using-name="role-id"
-             _in-xml-name="role-id"
-             _in-json-name="role-ids"
              gi="role-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -1506,19 +1116,9 @@
    <xsl:template match="function-performed"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/function-performed"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/functions-performed"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="function-performed"
-             _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"
-             _key-ref="oscal-implementation-common:function-performed"
-             _using-name="function-performed"
-             _in-xml-name="function-performed"
-             _in-json-name="functions-performed"
              gi="function-performed"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -1529,20 +1129,7 @@
    <xsl:template match="hash"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
          <value as-type="string" key="value" in-json="string">
             <xsl:value-of select="."/>
@@ -1553,15 +1140,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/uuid"
-            _metaschema-json-id="/assembly/oscal-ap/assessment-plan/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1570,15 +1150,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1587,33 +1160,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1621,15 +1176,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -1638,15 +1186,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1655,15 +1196,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1672,15 +1206,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -1689,18 +1216,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1710,33 +1227,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="role/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1744,15 +1243,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1761,18 +1253,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1782,15 +1264,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1799,15 +1274,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1816,15 +1284,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1834,15 +1295,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1851,15 +1305,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1868,15 +1315,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/import-ssp/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/import-ssp/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1885,15 +1325,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1902,18 +1335,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/type"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:system-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-implementation-common:system-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1923,15 +1346,8 @@
                  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-implementation-common/system-component/status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -1940,15 +1356,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1957,15 +1366,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1974,15 +1376,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1991,15 +1386,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -2008,15 +1396,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -2025,15 +1406,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -2042,15 +1416,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2060,15 +1427,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2077,15 +1437,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-user/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2094,36 +1447,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2131,33 +1463,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/name"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/ns"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2165,15 +1479,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -2182,15 +1489,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2200,15 +1500,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2217,18 +1510,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2237,18 +1520,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:objective-id"
-            _step="objective-id"
-            _key="objective-id"
-            _key-ref="oscal-assessment-common:objective-id"
-            _using-name="objective-id"
-            _in-xml-name="objective-id"
-            _in-json-name="objective-id"
             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2257,15 +1530,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2274,33 +1540,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2308,15 +1556,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/class"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -2325,15 +1566,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2342,18 +1576,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2362,18 +1586,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2383,15 +1597,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2401,15 +1608,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2418,15 +1618,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2435,15 +1628,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2453,15 +1639,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="date"
-            _key="date"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
             name="date"
             key="date"
-            _using-name="date"
-            _in-xml-name="date"
-            _in-json-name="date"
             gi="date">
          <xsl:value-of select="."/>
       </flag>
@@ -2471,15 +1650,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -2489,15 +1661,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -2507,15 +1672,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="positiveInteger"
-            _step="period"
-            _key="period"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
             name="period"
             key="period"
-            _using-name="period"
-            _in-xml-name="period"
-            _in-json-name="period"
             gi="period">
          <xsl:value-of select="."/>
       </flag>
@@ -2525,15 +1683,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="unit"
-            _key="unit"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
             name="unit"
             key="unit"
-            _using-name="unit"
-            _in-xml-name="unit"
-            _in-json-name="unit"
             gi="unit">
          <xsl:value-of select="."/>
       </flag>
@@ -2543,15 +1694,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2561,15 +1705,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="activity-uuid"
-            _key="activity-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/activity-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/activity-uuid"
             name="activity-uuid"
             key="activity-uuid"
-            _using-name="activity-uuid"
-            _in-xml-name="activity-uuid"
-            _in-json-name="activity-uuid"
             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2579,15 +1716,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2597,15 +1727,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2614,18 +1737,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2634,15 +1747,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -2652,15 +1758,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -2669,18 +1768,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2689,17 +1778,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2714,20 +1796,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2742,20 +1814,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2770,20 +1832,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2798,20 +1850,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2826,18 +1868,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -2868,10 +1899,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -2882,17 +1910,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2907,20 +1928,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2935,20 +1946,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2963,20 +1964,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2991,20 +1982,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3019,17 +2000,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3044,19 +2018,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -3068,17 +2032,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3093,17 +2050,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3118,17 +2068,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3143,18 +2086,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3172,17 +2108,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3197,17 +2126,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3222,19 +2144,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -3256,19 +2166,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3280,17 +2180,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3305,17 +2198,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3330,17 +2216,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3355,17 +2234,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3380,19 +2252,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -3404,19 +2266,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -3428,16 +2280,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -3449,17 +2294,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3474,17 +2312,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3499,17 +2330,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3524,16 +2348,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -3545,17 +2362,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3570,19 +2380,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -3594,19 +2394,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -3618,18 +2408,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -3648,19 +2427,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3672,17 +2441,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3697,17 +2459,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3722,17 +2477,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3747,17 +2495,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3772,16 +2513,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -3793,17 +2527,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3818,15 +2545,8 @@
                  priority="3"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -3873,17 +2593,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3898,18 +2611,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3927,17 +2633,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3952,17 +2651,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3977,16 +2669,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -3998,17 +2681,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4023,17 +2699,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4048,18 +2717,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4077,17 +2739,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4102,17 +2757,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4127,15 +2775,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -4165,17 +2805,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4190,17 +2823,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4215,17 +2841,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4240,17 +2859,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4265,18 +2877,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4294,17 +2899,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4319,17 +2917,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4344,18 +2935,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4373,18 +2957,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4402,17 +2979,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4427,17 +2997,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4452,17 +3015,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4477,17 +3033,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4502,18 +3051,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4531,17 +3073,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4556,15 +3091,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="step"
-                _key="steps"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps"
-                name="step"
-                _using-name="step"
-                _in-xml-name="step"
-                _in-json-name="steps"
-                gi="step">
+      <assembly name="step" gi="step">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -4597,17 +3124,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4622,18 +3142,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4651,17 +3164,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4676,18 +3182,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4705,17 +3204,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4730,15 +3222,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -4776,18 +3260,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4805,17 +3282,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4831,15 +3301,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -4850,18 +3313,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -4876,16 +3328,9 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -4897,18 +3342,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -4923,16 +3357,9 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -4944,15 +3371,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -4990,18 +3409,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5019,17 +3431,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5045,15 +3450,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5064,17 +3462,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5089,18 +3480,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5118,17 +3502,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5143,15 +3520,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -5189,18 +3558,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5218,17 +3580,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5244,15 +3599,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5263,18 +3611,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -5289,16 +3626,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -5310,18 +3640,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -5336,16 +3655,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -5357,15 +3669,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -5403,18 +3707,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5432,17 +3729,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5458,15 +3748,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5477,17 +3760,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5502,15 +3778,8 @@
                  priority="3"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="terms-and-conditions"
-                _key="terms-and-conditions"
-                _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions"
-                name="terms-and-conditions"
+      <assembly name="terms-and-conditions"
                 key="terms-and-conditions"
-                _using-name="terms-and-conditions"
-                _in-xml-name="terms-and-conditions"
-                _in-json-name="terms-and-conditions"
                 gi="terms-and-conditions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">terms-and-conditions</xsl:attribute>
@@ -5528,17 +3797,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5553,17 +3815,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5578,18 +3833,11 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5607,17 +3855,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5632,15 +3873,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -5678,18 +3911,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5707,17 +3933,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5733,15 +3952,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5752,18 +3964,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -5778,16 +3979,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -5799,18 +3993,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -5825,16 +4008,9 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -5846,15 +4022,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -5892,18 +4060,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5921,17 +4082,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5947,15 +4101,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5966,18 +4113,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5995,17 +4135,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6021,15 +4154,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -6040,17 +4166,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6065,17 +4184,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6090,17 +4202,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6115,18 +4220,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6144,17 +4242,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6169,17 +4260,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6194,16 +4278,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -6215,17 +4290,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6240,17 +4308,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6265,15 +4326,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="assessment-platform"
-                _key="assessment-platforms"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms"
-                name="assessment-platform"
-                _using-name="assessment-platform"
-                _in-xml-name="assessment-platform"
-                _in-json-name="assessment-platforms"
-                gi="assessment-platform">
+      <assembly name="assessment-platform" gi="assessment-platform">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -6304,17 +4357,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6329,17 +4375,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6354,15 +4393,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="uses-component"
-                _key="uses-components"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components"
-                name="uses-component"
-                _using-name="uses-component"
-                _in-xml-name="uses-component"
-                _in-json-name="uses-components"
-                gi="uses-component">
+      <assembly name="uses-component" gi="uses-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -6392,17 +4423,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6417,17 +4441,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6442,17 +4459,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6467,18 +4477,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6496,17 +4499,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6521,16 +4517,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -6543,17 +4530,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -6565,15 +4542,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -6587,15 +4557,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -6608,15 +4571,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -6625,15 +4580,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -6670,17 +4617,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6695,17 +4635,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6720,18 +4653,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6749,17 +4675,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6775,15 +4694,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -6794,17 +4706,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6819,17 +4724,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6844,18 +4742,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6873,17 +4764,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6899,15 +4783,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -6918,17 +4795,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6943,17 +4813,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6968,17 +4831,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6993,15 +4849,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -7035,17 +4883,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7060,18 +4901,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7089,19 +4923,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -7113,16 +4937,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -7147,17 +4962,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7172,17 +4980,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7197,15 +4998,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -7221,17 +5014,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
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 77ec36876c..e9904e9b7e 100644
--- a/json/convert/oscal_assessment-results_xml-to-json-converter.xsl
+++ b/json/convert/oscal_assessment-results_xml-to-json-converter.xsl
@@ -83,13 +83,8 @@
    <xsl:template match="assessment-results"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results"
-                _metaschema-json-id="/assembly/oscal-ar/assessment-results"
-                name="assessment-results"
+      <assembly name="assessment-results"
                 key="assessment-results"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-results</xsl:attribute>
@@ -114,19 +109,7 @@
    <xsl:template match="metadata"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -191,18 +174,7 @@
    <xsl:template match="prop"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@ns"/>
@@ -214,18 +186,7 @@
    <xsl:template match="link"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
@@ -235,18 +196,7 @@
    <xsl:template match="role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -271,18 +221,7 @@
    <xsl:template match="location"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="address"/>
@@ -327,18 +266,7 @@
    <xsl:template match="party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="name"/>
@@ -405,18 +333,7 @@
    <xsl:template match="responsible-party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="party-uuid" group-by="true()">
             <group in-json="ARRAY" key="party-uuids">
@@ -445,19 +362,7 @@
    <xsl:template match="import-ap"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/import-ap"
-                _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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:import-ap"
-                _step="import-ap"
-                _key="import-ap"
-                _key-ref="oscal-ar:import-ap"
-                _using-name="import-ap"
-                _in-xml-name="import-ap"
-                _in-json-name="import-ap"
-                gi="import-ap">
+      <assembly name="import-ap" key="import-ap" gi="import-ap">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-ap</xsl:attribute>
          </xsl:if>
@@ -468,18 +373,7 @@
    <xsl:template match="objectives-and-methods"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:local-objective"
-                _step="objectives-and-methods"
-                _key="objectives-and-methods"
-                _key-ref="oscal-assessment-common:local-objective"
-                _using-name="objectives-and-methods"
-                _in-xml-name="objectives-and-methods"
-                _in-json-name="objectives-and-methods"
-                gi="objectives-and-methods">
+      <assembly name="local-objective" gi="objectives-and-methods">
          <xsl:apply-templates select="@control-id"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -509,18 +403,7 @@
    <xsl:template match="objectives-and-methods/part | objectives-and-methods/part//part"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-catalog-common:part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="part" gi="part">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@ns"/>
@@ -536,21 +419,14 @@
          <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">
+                   key="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-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -575,18 +451,7 @@
    <xsl:template match="attestation/part | attestation/part//part"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-assessment-common:assessment-part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="assessment-part" gi="part">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@ns"/>
@@ -602,21 +467,14 @@
          <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">
+                   key="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-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -641,18 +499,7 @@
    <xsl:template match="activity"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:activity"
-                _step="activity"
-                _key="activities"
-                _key-ref="oscal-assessment-common:activity"
-                _using-name="activity"
-                _in-xml-name="activity"
-                _in-json-name="activities"
-                gi="activity">
+      <assembly name="activity" gi="activity">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -691,18 +538,8 @@
    <xsl:template match="reviewed-controls"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/reviewed-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="reviewed-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="reviewed-controls"
-                _in-xml-name="reviewed-controls"
-                _in-json-name="reviewed-controls"
                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
@@ -743,17 +580,7 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="include-objective"
-                _key="include-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="include-objective"
-                _in-xml-name="include-objective"
-                _in-json-name="include-objectives"
                 gi="include-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
@@ -762,17 +589,7 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="exclude-objective"
-                _key="exclude-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="exclude-objective"
-                _in-xml-name="exclude-objective"
-                _in-json-name="exclude-objectives"
                 gi="exclude-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
@@ -780,18 +597,7 @@
    <xsl:template match="responsible-role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -820,18 +626,8 @@
    <xsl:template match="related-controls"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/related-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="related-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="related-controls"
-                _in-xml-name="related-controls"
-                _in-json-name="related-controls"
                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
@@ -871,18 +667,7 @@
    <xsl:template match="result"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:result"
-                _step="result"
-                _key="results"
-                _key-ref="oscal-ar:result"
-                _using-name="result"
-                _in-xml-name="result"
-                _in-json-name="results"
-                gi="result">
+      <assembly name="result" gi="result">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -939,18 +724,7 @@
    <xsl:template match="component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-implementation-common:system-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="system-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -991,18 +765,7 @@
    <xsl:template match="protocol"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="title"/>
@@ -1018,19 +781,7 @@
    <xsl:template match="port-range"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
          <xsl:apply-templates select="@end"/>
          <xsl:apply-templates select="@transport"/>
@@ -1039,18 +790,7 @@
    <xsl:template match="inventory-item"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:inventory-item"
-                _step="inventory-item"
-                _key="inventory-items"
-                _key-ref="oscal-implementation-common:inventory-item"
-                _using-name="inventory-item"
-                _in-xml-name="inventory-item"
-                _in-json-name="inventory-items"
-                gi="inventory-item">
+      <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1087,18 +827,7 @@
    <xsl:template match="user"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-user"
-                _step="user"
-                _key="users"
-                _key-ref="oscal-implementation-common:system-user"
-                _using-name="user"
-                _in-xml-name="user"
-                _in-json-name="users"
-                gi="user">
+      <assembly name="system-user" gi="user">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -1137,18 +866,7 @@
    <xsl:template match="authorized-privilege"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:authorized-privilege"
-                _step="authorized-privilege"
-                _key="authorized-privileges"
-                _key-ref="oscal-implementation-common:authorized-privilege"
-                _using-name="authorized-privilege"
-                _in-xml-name="authorized-privilege"
-                _in-json-name="authorized-privileges"
-                gi="authorized-privilege">
+      <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="function-performed" group-by="true()">
@@ -1163,18 +881,8 @@
    <xsl:template match="assessment-assets"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/assessment-assets"
-                _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/assessment-assets"
-                name="assessment-assets"
+      <assembly name="assessment-assets"
                 key="assessment-assets"
-                _base-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"
-                _key-ref="oscal-assessment-common:assessment-assets"
-                _using-name="assessment-assets"
-                _in-xml-name="assessment-assets"
-                _in-json-name="assessment-assets"
                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
@@ -1198,18 +906,7 @@
    <xsl:template match="assessment-task"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="assessment-task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="assessment-task"
-                _in-xml-name="assessment-task"
-                _in-json-name="tasks"
-                gi="assessment-task">
+      <assembly name="task" gi="assessment-task">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -1270,19 +967,7 @@
    <xsl:template match="task"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly recursive="true"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="task"
-                _in-xml-name="task"
-                _in-json-name="tasks"
-                gi="task">
+      <assembly recursive="true" name="task" gi="task">
          <xsl:apply-templates select="assessment-task"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
@@ -1345,18 +1030,7 @@
    <xsl:template match="subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1394,18 +1068,7 @@
    <xsl:template match="include-subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="include-subject"
-                _key="include-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="include-subject"
-                _in-xml-name="include-subject"
-                _in-json-name="include-subjects"
-                gi="include-subject">
+      <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1428,18 +1091,7 @@
    <xsl:template match="exclude-subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="exclude-subject"
-                _key="exclude-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="exclude-subject"
-                _in-xml-name="exclude-subject"
-                _in-json-name="exclude-subjects"
-                gi="exclude-subject">
+      <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1462,19 +1114,7 @@
    <xsl:template match="logged-by"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:logged-by"
-                _step="logged-by"
-                _key="logged-by"
-                _key-ref="oscal-assessment-common:logged-by"
-                _using-name="logged-by"
-                _in-xml-name="logged-by"
-                _in-json-name="logged-by"
-                gi="logged-by">
+      <assembly as-type="empty" name="logged-by" gi="logged-by">
          <xsl:apply-templates select="@party-uuid"/>
          <xsl:apply-templates select="@role-id"/>
       </assembly>
@@ -1482,18 +1122,7 @@
    <xsl:template match="related-task"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:related-task"
-                _step="related-task"
-                _key="related-tasks"
-                _key-ref="oscal-assessment-common:related-task"
-                _using-name="related-task"
-                _in-xml-name="related-task"
-                _in-json-name="related-tasks"
-                gi="related-task">
+      <assembly name="related-task" gi="related-task">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -1530,18 +1159,7 @@
    <xsl:template match="observation"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:observation"
-                _step="observation"
-                _key="observations"
-                _key-ref="oscal-assessment-common:observation"
-                _using-name="observation"
-                _in-xml-name="observation"
-                _in-json-name="observations"
-                gi="observation">
+      <assembly name="observation" gi="observation">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -1602,18 +1220,7 @@
    <xsl:template match="origin"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin"
-                _step="origin"
-                _key="origins"
-                _key-ref="oscal-assessment-common:origin"
-                _using-name="origin"
-                _in-xml-name="origin"
-                _in-json-name="origins"
-                gi="origin">
+      <assembly name="origin" gi="origin">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">origin</xsl:attribute>
          </xsl:if>
@@ -1636,18 +1243,7 @@
    <xsl:template match="actor"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin-actor"
-                _step="actor"
-                _key="actors"
-                _key-ref="oscal-assessment-common:origin-actor"
-                _using-name="actor"
-                _in-xml-name="actor"
-                _in-json-name="actors"
-                gi="actor">
+      <assembly name="origin-actor" gi="actor">
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="@actor-uuid"/>
          <xsl:apply-templates select="@role-id"/>
@@ -1670,18 +1266,7 @@
    <xsl:template match="risk"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:risk"
-                _step="risk"
-                _key="risks"
-                _key-ref="oscal-assessment-common:risk"
-                _using-name="risk"
-                _in-xml-name="risk"
-                _in-json-name="risks"
-                gi="risk">
+      <assembly name="risk" gi="risk">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -1750,18 +1335,7 @@
    <xsl:template match="characterization"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:characterization"
-                _step="characterization"
-                _key="characterizations"
-                _key-ref="oscal-assessment-common:characterization"
-                _using-name="characterization"
-                _in-xml-name="characterization"
-                _in-json-name="characterizations"
-                gi="characterization">
+      <assembly name="characterization" gi="characterization">
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -1789,18 +1363,7 @@
    <xsl:template match="finding"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:finding"
-                _step="finding"
-                _key="findings"
-                _key-ref="oscal-ar:finding"
-                _using-name="finding"
-                _in-xml-name="finding"
-                _in-json-name="findings"
-                gi="finding">
+      <assembly name="finding" gi="finding">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -1847,19 +1410,7 @@
    <xsl:template match="target"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/finding/target"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:finding-target"
-                _step="target"
-                _key="target"
-                _key-ref="oscal-assessment-common:finding-target"
-                _using-name="target"
-                _in-xml-name="target"
-                _in-json-name="target"
-                gi="target">
+      <assembly name="finding-target" key="target" gi="target">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">target</xsl:attribute>
          </xsl:if>
@@ -1889,18 +1440,8 @@
    <xsl:template match="implementation-status"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/implementation-status"
-                _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/implementation-status"
-                name="implementation-status"
+      <assembly name="implementation-status"
                 key="implementation-status"
-                _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"
-                _key-ref="oscal-implementation-common:implementation-status"
-                _using-name="implementation-status"
-                _in-xml-name="implementation-status"
-                _in-json-name="implementation-status"
                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
@@ -1912,19 +1453,7 @@
    <xsl:template match="back-matter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -1940,21 +1469,11 @@
    <xsl:template match="remarks"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1971,19 +1490,9 @@
    <xsl:template match="location-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -1994,19 +1503,9 @@
    <xsl:template match="party-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -2017,19 +1516,9 @@
    <xsl:template match="role-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/role-id"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/role-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="role-id"
-             _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"
-             _key-ref="oscal-metadata:role-id"
-             _using-name="role-id"
-             _in-xml-name="role-id"
-             _in-json-name="role-ids"
              gi="role-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -2040,19 +1529,9 @@
    <xsl:template match="function-performed"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/function-performed"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/functions-performed"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="function-performed"
-             _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"
-             _key-ref="oscal-implementation-common:function-performed"
-             _using-name="function-performed"
-             _in-xml-name="function-performed"
-             _in-json-name="functions-performed"
              gi="function-performed"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -2063,20 +1542,7 @@
    <xsl:template match="threat-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/threat-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/threat-ids"
-             collapsible="no"
-             as-type="uri"
-             name="threat-id"
-             _base-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"
-             _key-ref="oscal-assessment-common:threat-id"
-             _using-name="threat-id"
-             _in-xml-name="threat-id"
-             _in-json-name="threat-ids"
-             gi="threat-id">
+      <field collapsible="no" as-type="uri" name="threat-id" gi="threat-id">
          <xsl:apply-templates select="@system"/>
          <xsl:apply-templates select="@href"/>
          <value as-type="uri" key="id" in-json="string">
@@ -2087,20 +1553,10 @@
    <xsl:template match="status-change"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/status-change"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/status-change"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-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"
-             _key-ref="oscal-assessment-common:risk-status"
-             _using-name="status-change"
-             _in-xml-name="status-change"
-             _in-json-name="status-change"
              gi="status-change"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2114,20 +1570,7 @@
    <xsl:template match="hash"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
          <value as-type="string" key="value" in-json="string">
             <xsl:value-of select="."/>
@@ -2138,15 +1581,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/assessment-results/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/assessment-results/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2155,15 +1591,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -2172,33 +1601,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2206,15 +1617,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -2223,15 +1627,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -2240,15 +1637,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2257,15 +1647,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -2274,18 +1657,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2295,33 +1668,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="role/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2329,15 +1684,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2346,18 +1694,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2367,15 +1705,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2384,15 +1715,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2401,15 +1725,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2419,15 +1736,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -2436,15 +1746,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2453,15 +1756,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-ar/import-ap/href"
-            _metaschema-json-id="/assembly/oscal-ar/import-ap/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2470,36 +1766,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2507,33 +1782,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/name"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/ns"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2541,15 +1798,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -2558,15 +1808,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2576,15 +1819,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2593,18 +1829,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2613,18 +1839,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:objective-id"
-            _step="objective-id"
-            _key="objective-id"
-            _key-ref="oscal-assessment-common:objective-id"
-            _using-name="objective-id"
-            _in-xml-name="objective-id"
-            _in-json-name="objective-id"
             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2633,15 +1849,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2650,15 +1859,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/result/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/result/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2667,15 +1869,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2684,18 +1879,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/type"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:system-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-implementation-common:system-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2705,15 +1890,8 @@
                  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-implementation-common/system-component/status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -2722,15 +1900,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2739,15 +1910,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -2756,15 +1920,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -2773,15 +1930,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -2790,15 +1940,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -2807,15 +1950,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2825,15 +1961,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2842,15 +1971,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-user/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2860,15 +1982,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2878,15 +1993,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2895,15 +2003,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2912,15 +2013,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2930,15 +2024,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="date"
-            _key="date"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
             name="date"
             key="date"
-            _using-name="date"
-            _in-xml-name="date"
-            _in-json-name="date"
             gi="date">
          <xsl:value-of select="."/>
       </flag>
@@ -2948,15 +2035,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -2966,15 +2046,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -2984,15 +2057,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="positiveInteger"
-            _step="period"
-            _key="period"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
             name="period"
             key="period"
-            _using-name="period"
-            _in-xml-name="period"
-            _in-json-name="period"
             gi="period">
          <xsl:value-of select="."/>
       </flag>
@@ -3002,15 +2068,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="unit"
-            _key="unit"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
             name="unit"
             key="unit"
-            _using-name="unit"
-            _in-xml-name="unit"
-            _in-json-name="unit"
             gi="unit">
          <xsl:value-of select="."/>
       </flag>
@@ -3020,15 +2079,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3038,15 +2090,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="activity-uuid"
-            _key="activity-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/activity-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/activity-uuid"
             name="activity-uuid"
             key="activity-uuid"
-            _using-name="activity-uuid"
-            _in-xml-name="activity-uuid"
-            _in-json-name="activity-uuid"
             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3055,15 +2100,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -3072,18 +2110,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3092,18 +2120,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -3112,15 +2130,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3129,33 +2140,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -3163,15 +2156,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/class"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -3181,15 +2167,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3198,15 +2177,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="party-uuid"
-            _key="party-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
             name="party-uuid"
             key="party-uuid"
-            _using-name="party-uuid"
-            _in-xml-name="party-uuid"
-            _in-json-name="party-uuid"
             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3215,15 +2187,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3232,15 +2197,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3250,15 +2208,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="subject-placeholder-uuid"
-            _key="subject-placeholder-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
             name="subject-placeholder-uuid"
             key="subject-placeholder-uuid"
-            _using-name="subject-placeholder-uuid"
-            _in-xml-name="subject-placeholder-uuid"
-            _in-json-name="subject-placeholder-uuid"
             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3267,15 +2218,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3284,15 +2228,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -3301,15 +2238,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="actor-uuid"
-            _key="actor-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
             name="actor-uuid"
             key="actor-uuid"
-            _using-name="actor-uuid"
-            _in-xml-name="actor-uuid"
-            _in-json-name="actor-uuid"
             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3318,15 +2248,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3335,18 +2258,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3355,18 +2268,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -3376,15 +2279,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -3393,15 +2289,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3410,15 +2299,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/system"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -3427,15 +2309,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/href"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -3445,15 +2320,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -3463,15 +2331,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/system"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -3481,15 +2342,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/value"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -3499,15 +2353,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3517,15 +2364,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="implementation-uuid"
-            _key="implementation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/implementation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/implementation-uuid"
             name="implementation-uuid"
             key="implementation-uuid"
-            _using-name="implementation-uuid"
-            _in-xml-name="implementation-uuid"
-            _in-json-name="implementation-uuid"
             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3535,15 +2375,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3553,15 +2386,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="lifecycle"
-            _key="lifecycle"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/lifecycle"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/lifecycle"
             name="lifecycle"
             key="lifecycle"
-            _using-name="lifecycle"
-            _in-xml-name="lifecycle"
-            _in-json-name="lifecycle"
             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
@@ -3571,15 +2397,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3589,15 +2408,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3607,15 +2419,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="response-uuid"
-            _key="response-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response/response-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses/response-uuid"
             name="response-uuid"
             key="response-uuid"
-            _using-name="response-uuid"
-            _in-xml-name="response-uuid"
-            _in-json-name="response-uuid"
             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3625,15 +2430,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3642,15 +2440,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3659,15 +2450,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -3676,15 +2460,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="target-id"
-            _key="target-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/target-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/target-id"
             name="target-id"
             key="target-id"
-            _using-name="target-id"
-            _in-xml-name="target-id"
-            _in-json-name="target-id"
             gi="target-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3694,15 +2471,8 @@
                  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>
@@ -3712,15 +2482,8 @@
                  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>
@@ -3729,15 +2492,8 @@
                  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-implementation-common/implementation-status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/implementation-status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -3747,15 +2503,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3765,15 +2514,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="risk-uuid"
-            _key="risk-uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/associated-risk/risk-uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/related-risks/risk-uuid"
             name="risk-uuid"
             key="risk-uuid"
-            _using-name="risk-uuid"
-            _in-xml-name="risk-uuid"
-            _in-json-name="risk-uuid"
             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3783,15 +2525,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3801,15 +2536,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -3818,18 +2546,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -3838,15 +2556,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -3856,15 +2567,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -3873,18 +2577,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -3893,17 +2587,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3918,20 +2605,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3946,20 +2623,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3974,20 +2641,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4002,20 +2659,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4030,18 +2677,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -4072,10 +2708,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -4086,17 +2719,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4111,20 +2737,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4139,20 +2755,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4167,20 +2773,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4195,20 +2791,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4223,17 +2809,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4248,19 +2827,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -4272,17 +2841,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4297,17 +2859,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4322,17 +2877,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4347,18 +2895,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4376,17 +2917,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4401,17 +2935,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4426,19 +2953,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -4460,19 +2975,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -4484,17 +2989,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4509,17 +3007,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4534,17 +3025,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4559,17 +3043,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4584,19 +3061,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -4608,19 +3075,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -4632,16 +3089,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -4653,17 +3103,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4678,17 +3121,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4703,17 +3139,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4728,16 +3157,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -4749,17 +3171,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4774,19 +3189,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -4798,19 +3203,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -4822,18 +3217,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -4852,19 +3236,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -4876,17 +3250,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4901,17 +3268,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4926,17 +3286,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4951,17 +3304,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4976,16 +3322,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -4997,17 +3336,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5022,15 +3354,8 @@
                  priority="3"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ar/assessment-results/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ar/assessment-results/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -5056,18 +3381,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5085,17 +3403,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5110,17 +3421,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5135,17 +3439,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5160,17 +3457,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5185,18 +3475,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5214,17 +3497,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5239,15 +3515,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="step"
-                _key="steps"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps"
-                name="step"
-                _using-name="step"
-                _in-xml-name="step"
-                _in-json-name="steps"
-                gi="step">
+      <assembly name="step" gi="step">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -5280,17 +3548,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5305,18 +3566,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5334,17 +3588,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5359,18 +3606,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5388,17 +3628,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5413,15 +3646,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -5459,18 +3684,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5488,17 +3706,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5514,15 +3725,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5533,18 +3737,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -5559,16 +3752,9 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -5580,18 +3766,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -5606,16 +3781,9 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -5627,15 +3795,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -5673,18 +3833,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5702,17 +3855,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5728,15 +3874,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5747,17 +3886,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5772,18 +3904,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5801,17 +3926,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5826,15 +3944,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -5872,18 +3982,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5901,17 +4004,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5927,15 +4023,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5946,18 +4035,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -5972,16 +4050,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -5993,18 +4064,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -6019,16 +4079,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -6040,15 +4093,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -6086,18 +4131,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6115,17 +4153,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6141,15 +4172,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -6160,17 +4184,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6185,17 +4202,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/result/title"
-             _metaschema-json-id="/assembly/oscal-ar/result/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6210,18 +4220,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/result/description"
-             _metaschema-json-id="/assembly/oscal-ar/result/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6239,17 +4242,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-ar/result/start"
-             _metaschema-json-id="/assembly/oscal-ar/result/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6264,17 +4260,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-ar/result/end"
-             _metaschema-json-id="/assembly/oscal-ar/result/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6289,17 +4278,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6314,15 +4296,8 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ar/result/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -6362,17 +4337,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6387,18 +4355,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6416,17 +4377,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6441,17 +4395,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6466,16 +4413,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -6487,17 +4425,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6512,17 +4443,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6537,18 +4461,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6566,17 +4483,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6591,17 +4501,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6616,15 +4519,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -6654,17 +4549,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6679,17 +4567,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6704,17 +4585,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6729,17 +4603,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6754,18 +4621,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6783,17 +4643,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6808,17 +4661,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6833,18 +4679,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6862,17 +4701,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6887,18 +4719,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6916,17 +4741,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6941,17 +4759,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6966,16 +4777,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -6987,17 +4789,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7012,17 +4807,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7037,15 +4825,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="assessment-platform"
-                _key="assessment-platforms"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms"
-                name="assessment-platform"
-                _using-name="assessment-platform"
-                _in-xml-name="assessment-platform"
-                _in-json-name="assessment-platforms"
-                gi="assessment-platform">
+      <assembly name="assessment-platform" gi="assessment-platform">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -7076,17 +4856,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7101,17 +4874,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7126,15 +4892,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="uses-component"
-                _key="uses-components"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components"
-                name="uses-component"
-                _using-name="uses-component"
-                _in-xml-name="uses-component"
-                _in-json-name="uses-components"
-                gi="uses-component">
+      <assembly name="uses-component" gi="uses-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -7164,17 +4922,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7189,17 +4940,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7214,17 +4958,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7239,18 +4976,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7268,17 +4998,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7293,16 +5016,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -7315,17 +5029,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -7337,15 +5041,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -7359,15 +5056,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -7380,15 +5070,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -7397,15 +5079,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -7442,17 +5116,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7467,17 +5134,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7492,18 +5152,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7521,17 +5174,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7547,15 +5193,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7566,17 +5205,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7591,17 +5223,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7616,18 +5241,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7645,17 +5263,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7671,15 +5282,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7690,17 +5294,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7715,17 +5312,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7740,17 +5330,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7765,18 +5348,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7794,17 +5370,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7819,15 +5388,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -7865,18 +5426,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7894,17 +5448,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7920,15 +5467,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7939,18 +5479,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -7965,16 +5494,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -7986,18 +5508,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -8012,16 +5523,9 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -8033,15 +5537,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -8079,18 +5575,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8108,17 +5597,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8134,15 +5616,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -8153,15 +5628,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="attestation"
-                _key="attestations"
-                _metaschema-xml-id="/assembly/oscal-ar/result/attestation"
-                _metaschema-json-id="/assembly/oscal-ar/result/attestations"
-                name="attestation"
-                _using-name="attestation"
-                _in-xml-name="attestation"
-                _in-json-name="attestations"
-                gi="attestation">
+      <assembly name="attestation" gi="attestation">
          <xsl:for-each-group select="responsible-party" group-by="true()">
             <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
@@ -8182,17 +5649,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8207,17 +5667,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8232,17 +5685,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8257,16 +5703,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="assessment-log"
-                _key="assessment-log"
-                _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log"
-                _metaschema-json-id="/assembly/oscal-ar/result/assessment-log"
-                name="assessment-log"
-                key="assessment-log"
-                _using-name="assessment-log"
-                _in-xml-name="assessment-log"
-                _in-json-name="assessment-log"
-                gi="assessment-log">
+      <assembly name="assessment-log" key="assessment-log" gi="assessment-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-log</xsl:attribute>
          </xsl:if>
@@ -8283,15 +5720,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry"
-                _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -8332,17 +5761,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8357,18 +5779,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8386,17 +5801,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8411,17 +5819,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8436,17 +5837,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8461,17 +5855,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8486,17 +5873,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8511,18 +5891,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8540,17 +5913,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8566,15 +5932,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -8585,17 +5944,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8610,17 +5962,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8635,15 +5980,8 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -8662,18 +6000,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8691,17 +6022,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8717,15 +6041,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -8736,17 +6053,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8761,17 +6071,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8786,17 +6089,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8811,18 +6107,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8840,17 +6129,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8865,16 +6147,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="method"
-             _key="methods"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/method"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/methods"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="method"
-             _using-name="method"
-             _in-xml-name="method"
-             _in-json-name="methods"
              gi="method"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -8886,16 +6161,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="type"
-             _key="types"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/type"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/types"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="type"
-             _using-name="type"
-             _in-xml-name="type"
-             _in-json-name="types"
              gi="type"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -8907,17 +6175,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8932,17 +6193,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8957,17 +6211,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8982,18 +6229,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9011,17 +6251,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9037,15 +6270,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -9056,17 +6282,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9081,17 +6300,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9106,15 +6318,8 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -9133,18 +6338,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9162,17 +6360,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9188,15 +6379,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -9207,17 +6391,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9232,17 +6409,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9257,18 +6427,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -9293,17 +6452,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9318,17 +6470,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9343,15 +6488,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="relevant-evidence"
-                _key="relevant-evidence"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                name="relevant-evidence"
-                _using-name="relevant-evidence"
-                _in-xml-name="relevant-evidence"
-                _in-json-name="relevant-evidence"
-                gi="relevant-evidence">
+      <assembly name="relevant-evidence" gi="relevant-evidence">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -9375,18 +6512,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9404,17 +6534,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9429,17 +6552,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="collected"
-             _key="collected"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/collected"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/collected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="collected"
              key="collected"
-             _using-name="collected"
-             _in-xml-name="collected"
-             _in-json-name="collected"
              gi="collected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9454,17 +6570,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expires"
-             _key="expires"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/expires"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/expires"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="expires"
              key="expires"
-             _using-name="expires"
-             _in-xml-name="expires"
-             _in-json-name="expires"
              gi="expires"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9479,17 +6588,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9504,18 +6606,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9533,18 +6628,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement"
-             _key="statement"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/statement"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/statement"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="statement"
              key="statement"
-             _using-name="statement"
-             _in-xml-name="statement"
-             _in-json-name="statement"
              gi="statement"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9562,17 +6650,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9587,17 +6668,10 @@
                  priority="7"
                  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/risk/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/status"
-             collapsible="no"
+      <field 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">
          <xsl:if test="$with-key">
@@ -9612,17 +6686,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9637,17 +6704,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9662,17 +6722,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9687,18 +6740,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9716,17 +6762,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9742,15 +6781,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -9761,17 +6793,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9786,17 +6811,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9811,15 +6829,8 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -9838,18 +6849,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9867,17 +6871,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9893,15 +6890,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -9912,17 +6902,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9937,17 +6920,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9962,17 +6938,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9987,17 +6956,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10012,17 +6974,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10037,17 +6992,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10062,18 +7010,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10091,17 +7032,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10117,15 +7051,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -10136,17 +7063,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10161,17 +7081,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10186,15 +7099,8 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -10213,18 +7119,11 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10242,17 +7141,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10268,15 +7160,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -10287,17 +7172,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10312,17 +7190,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10337,15 +7208,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="facet"
-                _key="facets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet"
-                _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets"
-                name="facet"
-                _using-name="facet"
-                _in-xml-name="facet"
-                _in-json-name="facets"
-                gi="facet">
+      <assembly name="facet" gi="facet">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@system"/>
          <xsl:apply-templates select="@value"/>
@@ -10370,17 +7233,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10395,15 +7251,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="mitigating-factor"
-                _key="mitigating-factors"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors"
-                name="mitigating-factor"
-                _using-name="mitigating-factor"
-                _in-xml-name="mitigating-factor"
-                _in-json-name="mitigating-factors"
-                gi="mitigating-factor">
+      <assembly name="mitigating-factor" gi="mitigating-factor">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@implementation-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -10434,18 +7282,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10463,17 +7304,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10488,18 +7322,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -10524,17 +7347,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10549,17 +7365,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10574,17 +7383,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="deadline"
-             _key="deadline"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/deadline"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/deadline"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="deadline"
              key="deadline"
-             _using-name="deadline"
-             _in-xml-name="deadline"
-             _in-json-name="deadline"
              gi="deadline"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10599,18 +7401,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:response"
-                _step="response"
-                _key="remediations"
-                _key-ref="oscal-assessment-common:response"
-                _using-name="response"
-                _in-xml-name="response"
-                _in-json-name="remediations"
-                gi="response">
+      <assembly name="response" gi="response">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@lifecycle"/>
          <xsl:apply-templates select="title"/>
@@ -10657,17 +7448,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10682,18 +7466,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10711,17 +7488,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10736,17 +7506,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10761,17 +7524,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10786,17 +7542,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10811,18 +7560,11 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10840,17 +7582,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10866,15 +7601,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -10885,17 +7613,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10910,17 +7631,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10935,15 +7649,8 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -10962,18 +7669,11 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10991,17 +7691,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11017,15 +7710,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -11036,17 +7722,10 @@
                  priority="21"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11061,17 +7740,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11086,15 +7758,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="required-asset"
-                _key="required-assets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset"
-                _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets"
-                name="required-asset"
-                _using-name="required-asset"
-                _in-xml-name="required-asset"
-                _in-json-name="required-assets"
-                gi="required-asset">
+      <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="@uuid"/>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
@@ -11126,18 +7790,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -11162,17 +7815,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11187,17 +7833,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11212,17 +7851,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11237,18 +7869,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11266,17 +7891,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11291,17 +7909,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11316,18 +7927,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11345,17 +7949,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11370,16 +7967,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -11392,17 +7980,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -11414,15 +7992,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -11436,15 +8007,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -11457,15 +8021,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -11474,15 +8030,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -11519,17 +8067,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11544,17 +8085,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11569,18 +8103,11 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11598,17 +8125,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11624,15 +8144,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -11643,17 +8156,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11668,17 +8174,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11693,18 +8192,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11722,17 +8214,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11748,15 +8233,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -11767,17 +8245,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11792,17 +8263,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11817,17 +8281,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11842,16 +8299,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="risk-log"
-                _key="risk-log"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log"
-                name="risk-log"
-                key="risk-log"
-                _using-name="risk-log"
-                _in-xml-name="risk-log"
-                _in-json-name="risk-log"
-                gi="risk-log">
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">risk-log</xsl:attribute>
          </xsl:if>
@@ -11868,15 +8316,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -11918,17 +8358,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11943,18 +8376,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11972,17 +8398,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11997,17 +8416,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12022,17 +8434,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12047,15 +8452,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="related-response"
-                _key="related-responses"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses"
-                name="related-response"
-                _using-name="related-response"
-                _in-xml-name="related-response"
-                _in-json-name="related-responses"
-                gi="related-response">
+      <assembly name="related-response" gi="related-response">
          <xsl:apply-templates select="@response-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -12085,17 +8482,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12110,17 +8500,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12135,17 +8518,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12160,18 +8536,11 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12189,17 +8558,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12215,15 +8577,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -12234,17 +8589,10 @@
                  priority="21"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12259,17 +8607,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12284,15 +8625,8 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -12311,18 +8645,11 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12340,17 +8667,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12366,15 +8686,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -12385,17 +8698,10 @@
                  priority="22"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12410,17 +8716,10 @@
                  priority="21"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12435,16 +8734,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
@@ -12452,17 +8742,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/title"
-             _metaschema-json-id="/assembly/oscal-ar/finding/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12477,18 +8760,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/description"
-             _metaschema-json-id="/assembly/oscal-ar/finding/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12506,17 +8782,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12531,17 +8800,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12556,17 +8818,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12581,17 +8836,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12606,18 +8854,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12635,17 +8876,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12661,15 +8895,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -12680,17 +8907,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12705,17 +8925,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12730,15 +8943,8 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -12757,18 +8963,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12786,17 +8985,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12812,15 +9004,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -12831,17 +9016,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12856,17 +9034,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12881,17 +9052,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12906,18 +9070,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12935,17 +9092,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12960,16 +9110,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -12982,17 +9123,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="implementation-statement-uuid"
-             _key="implementation-statement-uuid"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/implementation-statement-uuid"
-             _metaschema-json-id="/assembly/oscal-ar/finding/implementation-statement-uuid"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="implementation-statement-uuid"
              key="implementation-statement-uuid"
-             _using-name="implementation-statement-uuid"
-             _in-xml-name="implementation-statement-uuid"
-             _in-json-name="implementation-statement-uuid"
              gi="implementation-statement-uuid"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13007,16 +9141,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-ar/finding/related-observation"
-                _metaschema-json-id="/assembly/oscal-ar/finding/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
@@ -13024,16 +9149,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="associated-risk"
-                _key="related-risks"
-                _metaschema-xml-id="/assembly/oscal-ar/finding/associated-risk"
-                _metaschema-json-id="/assembly/oscal-ar/finding/related-risks"
-                name="associated-risk"
-                _using-name="associated-risk"
-                _in-xml-name="associated-risk"
-                _in-json-name="related-risks"
-                gi="associated-risk">
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="@risk-uuid"/>
       </assembly>
    </xsl:template>
@@ -13041,15 +9157,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -13083,17 +9191,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13108,18 +9209,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13137,19 +9231,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -13161,16 +9245,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -13195,17 +9270,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13220,17 +9288,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13245,15 +9306,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -13269,17 +9322,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
diff --git a/json/convert/oscal_catalog_xml-to-json-converter.xsl b/json/convert/oscal_catalog_xml-to-json-converter.xsl
index fd257c7794..cd176f99fe 100644
--- a/json/convert/oscal_catalog_xml-to-json-converter.xsl
+++ b/json/convert/oscal_catalog_xml-to-json-converter.xsl
@@ -83,14 +83,7 @@
    <xsl:template match="catalog"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog"
-                _metaschema-json-id="/assembly/oscal-catalog/catalog"
-                name="catalog"
-                key="catalog"
-                _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">
+      <assembly name="catalog" key="catalog" gi="catalog">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">catalog</xsl:attribute>
          </xsl:if>
@@ -126,19 +119,7 @@
    <xsl:template match="metadata"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -203,18 +184,7 @@
    <xsl:template match="prop"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@ns"/>
@@ -226,18 +196,7 @@
    <xsl:template match="link"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
@@ -247,18 +206,7 @@
    <xsl:template match="role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -283,18 +231,7 @@
    <xsl:template match="location"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="address"/>
@@ -339,18 +276,7 @@
    <xsl:template match="party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="name"/>
@@ -417,18 +343,7 @@
    <xsl:template match="responsible-party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="party-uuid" group-by="true()">
             <group in-json="ARRAY" key="party-uuids">
@@ -457,18 +372,7 @@
    <xsl:template match="param"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter"
-                _step="param"
-                _key="params"
-                _key-ref="oscal-catalog-common:parameter"
-                _using-name="param"
-                _in-xml-name="param"
-                _in-json-name="params"
-                gi="param">
+      <assembly name="parameter" gi="param">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="@depends-on"/>
@@ -516,18 +420,7 @@
    <xsl:template match="constraint"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-constraint"
-                _step="constraint"
-                _key="constraints"
-                _key-ref="oscal-catalog-common:parameter-constraint"
-                _using-name="constraint"
-                _in-xml-name="constraint"
-                _in-json-name="constraints"
-                gi="constraint">
+      <assembly name="parameter-constraint" gi="constraint">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="test" group-by="true()">
             <group in-json="ARRAY" key="tests">
@@ -541,36 +434,18 @@
    <xsl:template match="guideline"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-guideline"
-                _step="guideline"
-                _key="guidelines"
-                _key-ref="oscal-catalog-common:parameter-guideline"
-                _using-name="guideline"
-                _in-xml-name="guideline"
-                _in-json-name="guidelines"
-                gi="guideline">
+      <assembly name="parameter-guideline" gi="guideline">
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
                              group-by="true()">
             <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">
+                   key="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-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -581,19 +456,7 @@
    <xsl:template match="select"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/select"
-                _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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-selection"
-                _step="select"
-                _key="select"
-                _key-ref="oscal-catalog-common:parameter-selection"
-                _using-name="select"
-                _in-xml-name="select"
-                _in-json-name="select"
-                gi="select">
+      <assembly name="parameter-selection" key="select" gi="select">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">select</xsl:attribute>
          </xsl:if>
@@ -610,18 +473,7 @@
    <xsl:template match="control"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_catalog_metaschema.xml"
-                _key-name="oscal-catalog:control"
-                _step="control"
-                _key="controls"
-                _key-ref="oscal-catalog:control"
-                _using-name="control"
-                _in-xml-name="control"
-                _in-json-name="controls"
-                gi="control">
+      <assembly name="control" gi="control">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="title"/>
@@ -665,18 +517,7 @@
    <xsl:template match="part"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-catalog-common:part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="part" gi="part">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@ns"/>
@@ -692,21 +533,14 @@
          <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">
+                   key="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-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -731,18 +565,7 @@
    <xsl:template match="group"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_catalog_metaschema.xml"
-                _key-name="oscal-catalog:group"
-                _step="group"
-                _key="groups"
-                _key-ref="oscal-catalog:group"
-                _using-name="group"
-                _in-xml-name="group"
-                _in-json-name="groups"
-                gi="group">
+      <assembly name="group" gi="group">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="title"/>
@@ -793,19 +616,7 @@
    <xsl:template match="back-matter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -821,21 +632,11 @@
    <xsl:template match="remarks"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -852,19 +653,9 @@
    <xsl:template match="location-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -875,19 +666,9 @@
    <xsl:template match="party-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -898,19 +679,9 @@
    <xsl:template match="value"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/value"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _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"
-             _key-ref="oscal-catalog-common:parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -921,20 +692,7 @@
    <xsl:template match="hash"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
          <value as-type="string" key="value" in-json="string">
             <xsl:value-of select="."/>
@@ -945,15 +703,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-catalog/catalog/uuid"
-            _metaschema-json-id="/assembly/oscal-catalog/catalog/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -962,15 +713,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -979,33 +723,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1013,15 +739,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -1030,15 +749,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1047,15 +759,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1064,15 +769,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -1081,18 +779,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1102,33 +790,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="role/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1136,15 +806,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1153,18 +816,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1174,15 +827,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1191,15 +837,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1208,15 +847,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1226,15 +858,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1243,33 +868,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1277,15 +884,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1294,18 +894,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/depends-on"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:depends-on"
-            _step="depends-on"
-            _key="depends-on"
-            _key-ref="oscal-catalog-common:depends-on"
-            _using-name="depends-on"
-            _in-xml-name="depends-on"
-            _in-json-name="depends-on"
             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
@@ -1314,33 +904,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="how-many"
-            _key="how-many"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
             name="how-many"
             key="how-many"
-            _using-name="how-many"
-            _in-xml-name="how-many"
-            _in-json-name="how-many"
             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="control/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog/control/id"
-            _metaschema-json-id="/assembly/oscal-catalog/control/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1348,33 +920,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog/control/class"
-            _metaschema-json-id="/assembly/oscal-catalog/control/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1382,33 +936,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/name"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/ns"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1416,33 +952,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog/group/id"
-            _metaschema-json-id="/assembly/oscal-catalog/group/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1450,15 +968,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog/group/class"
-            _metaschema-json-id="/assembly/oscal-catalog/group/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1468,15 +979,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1486,15 +990,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1503,18 +1000,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1523,15 +1010,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -1541,15 +1021,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -1558,18 +1031,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1578,17 +1041,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1603,20 +1059,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1631,20 +1077,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1659,20 +1095,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1687,20 +1113,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1715,18 +1131,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -1757,10 +1162,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1771,17 +1173,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1796,20 +1191,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1824,20 +1209,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1852,20 +1227,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1880,20 +1245,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1908,17 +1263,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1933,19 +1281,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -1957,17 +1295,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1982,17 +1313,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2007,17 +1331,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2032,18 +1349,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2061,17 +1371,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2086,17 +1389,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2111,19 +1407,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -2145,19 +1429,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -2169,17 +1443,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2194,17 +1461,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2219,17 +1479,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2244,17 +1497,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2269,19 +1515,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -2293,19 +1529,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -2317,16 +1543,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -2338,17 +1557,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2363,17 +1575,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2388,17 +1593,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2413,16 +1611,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -2434,17 +1625,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2459,19 +1643,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -2483,19 +1657,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -2507,18 +1671,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -2537,19 +1690,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -2561,17 +1704,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2586,17 +1722,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2611,17 +1740,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2636,17 +1758,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2661,16 +1776,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -2682,17 +1790,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2707,17 +1808,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2732,17 +1826,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2757,18 +1844,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2786,18 +1866,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2815,15 +1888,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -2832,17 +1897,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2857,16 +1915,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -2878,17 +1929,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/control/title"
-             _metaschema-json-id="/assembly/oscal-catalog/control/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2903,17 +1947,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2928,17 +1965,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2953,18 +1983,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2982,18 +2005,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3011,15 +2027,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -3028,17 +2036,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3053,16 +2054,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -3074,17 +2068,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3099,17 +2086,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3124,17 +2104,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3149,17 +2122,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/group/title"
-             _metaschema-json-id="/assembly/oscal-catalog/group/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3174,17 +2140,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3199,17 +2158,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3224,18 +2176,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3253,18 +2198,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3282,15 +2220,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -3299,17 +2229,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3324,16 +2247,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -3345,17 +2261,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3370,17 +2279,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3395,17 +2297,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3420,17 +2315,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/control/title"
-             _metaschema-json-id="/assembly/oscal-catalog/control/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3445,17 +2333,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3470,17 +2351,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3495,18 +2369,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3524,18 +2391,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3553,15 +2413,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -3570,17 +2422,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3595,16 +2440,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -3616,17 +2454,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3641,17 +2472,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3666,17 +2490,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3691,15 +2508,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -3733,17 +2542,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3758,18 +2560,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3787,19 +2582,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -3811,16 +2596,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -3845,17 +2621,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3870,17 +2639,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3895,15 +2657,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -3919,17 +2673,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
diff --git a/json/convert/oscal_complete_xml-to-json-converter.xsl b/json/convert/oscal_complete_xml-to-json-converter.xsl
index b98789f30e..21c6a00a48 100644
--- a/json/convert/oscal_complete_xml-to-json-converter.xsl
+++ b/json/convert/oscal_complete_xml-to-json-converter.xsl
@@ -83,14 +83,7 @@
    <xsl:template match="catalog"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog"
-                _metaschema-json-id="/assembly/oscal-catalog/catalog"
-                name="catalog"
-                key="catalog"
-                _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">
+      <assembly name="catalog" key="catalog" gi="catalog">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">catalog</xsl:attribute>
          </xsl:if>
@@ -126,19 +119,7 @@
    <xsl:template match="metadata"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -203,18 +184,7 @@
    <xsl:template match="prop"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@ns"/>
@@ -226,18 +196,7 @@
    <xsl:template match="link"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
@@ -247,18 +206,7 @@
    <xsl:template match="role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -283,18 +231,7 @@
    <xsl:template match="location"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="address"/>
@@ -339,18 +276,7 @@
    <xsl:template match="party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="name"/>
@@ -417,18 +343,7 @@
    <xsl:template match="responsible-party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="party-uuid" group-by="true()">
             <group in-json="ARRAY" key="party-uuids">
@@ -457,18 +372,7 @@
    <xsl:template match="param"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter"
-                _step="param"
-                _key="params"
-                _key-ref="oscal-catalog-common:parameter"
-                _using-name="param"
-                _in-xml-name="param"
-                _in-json-name="params"
-                gi="param">
+      <assembly name="parameter" gi="param">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="@depends-on"/>
@@ -516,18 +420,7 @@
    <xsl:template match="constraint"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-constraint"
-                _step="constraint"
-                _key="constraints"
-                _key-ref="oscal-catalog-common:parameter-constraint"
-                _using-name="constraint"
-                _in-xml-name="constraint"
-                _in-json-name="constraints"
-                gi="constraint">
+      <assembly name="parameter-constraint" gi="constraint">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="test" group-by="true()">
             <group in-json="ARRAY" key="tests">
@@ -541,36 +434,18 @@
    <xsl:template match="guideline"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-guideline"
-                _step="guideline"
-                _key="guidelines"
-                _key-ref="oscal-catalog-common:parameter-guideline"
-                _using-name="guideline"
-                _in-xml-name="guideline"
-                _in-json-name="guidelines"
-                gi="guideline">
+      <assembly name="parameter-guideline" gi="guideline">
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
                              group-by="true()">
             <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">
+                   key="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-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -581,19 +456,7 @@
    <xsl:template match="select"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/select"
-                _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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-selection"
-                _step="select"
-                _key="select"
-                _key-ref="oscal-catalog-common:parameter-selection"
-                _using-name="select"
-                _in-xml-name="select"
-                _in-json-name="select"
-                gi="select">
+      <assembly name="parameter-selection" key="select" gi="select">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">select</xsl:attribute>
          </xsl:if>
@@ -610,18 +473,7 @@
    <xsl:template match="control"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_catalog_metaschema.xml"
-                _key-name="oscal-catalog:control"
-                _step="control"
-                _key="controls"
-                _key-ref="oscal-catalog:control"
-                _using-name="control"
-                _in-xml-name="control"
-                _in-json-name="controls"
-                gi="control">
+      <assembly name="control" gi="control">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="title"/>
@@ -665,18 +517,7 @@
    <xsl:template match="control/part | control/part//part | group/part | group/part//part | control/part | control/part//part | group/part | group/part//part | add/part | add/part//part | objectives-and-methods/part | objectives-and-methods/part//part | objectives-and-methods/part | objectives-and-methods/part//part"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-catalog-common:part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="part" gi="part">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@ns"/>
@@ -692,21 +533,14 @@
          <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">
+                   key="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-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -731,18 +565,7 @@
    <xsl:template match="terms-and-conditions/part | terms-and-conditions/part//part | attestation/part | attestation/part//part"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-assessment-common:assessment-part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="assessment-part" gi="part">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@ns"/>
@@ -758,21 +581,14 @@
          <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">
+                   key="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-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -797,18 +613,7 @@
    <xsl:template match="catalog/group | catalog/group//group"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _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/src/metaschema/oscal_catalog_metaschema.xml"
-                _key-name="oscal-catalog:group"
-                _step="group"
-                _key="groups"
-                _key-ref="oscal-catalog:group"
-                _using-name="group"
-                _in-xml-name="group"
-                _in-json-name="groups"
-                gi="group">
+      <assembly name="group" gi="group">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="title"/>
@@ -859,18 +664,7 @@
    <xsl:template match="custom/group | custom/group//group"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:group"
-                _step="group"
-                _key="groups"
-                _key-ref="oscal-profile:group"
-                _using-name="group"
-                _in-xml-name="group"
-                _in-json-name="groups"
-                gi="group">
+      <assembly name="group" gi="group">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="title"/>
@@ -921,19 +715,7 @@
    <xsl:template match="back-matter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -949,14 +731,7 @@
    <xsl:template match="profile"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile"
-                _metaschema-json-id="/assembly/oscal-profile/profile"
-                name="profile"
-                key="profile"
-                _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">
+      <assembly name="profile" key="profile" gi="profile">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">profile</xsl:attribute>
          </xsl:if>
@@ -980,18 +755,7 @@
    <xsl:template match="import"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:import"
-                _step="import"
-                _key="imports"
-                _key-ref="oscal-profile:import"
-                _using-name="import"
-                _in-xml-name="import"
-                _in-json-name="imports"
-                gi="import">
+      <assembly name="import" gi="import">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="include-all"/>
          <xsl:for-each-group select="include-controls" group-by="true()">
@@ -1014,18 +778,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _metaschema-xml-id="/assembly/oscal-profile/import/include-all"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:include-all"
-                _step="include-all"
-                _key="include-all"
-                _key-ref="oscal-profile:include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -1035,19 +789,7 @@
    <xsl:template match="merge"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/merge"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:merge"
-                _step="merge"
-                _key="merge"
-                _key-ref="oscal-profile:merge"
-                _using-name="merge"
-                _in-xml-name="merge"
-                _in-json-name="merge"
-                gi="merge">
+      <assembly name="merge" key="merge" gi="merge">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">merge</xsl:attribute>
          </xsl:if>
@@ -1059,20 +801,7 @@
    <xsl:template match="combine"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _metaschema-xml-id="/assembly/oscal-profile/merge/combine"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:combine"
-                _step="combine"
-                _key="combine"
-                _key-ref="oscal-profile:combine"
-                _using-name="combine"
-                _in-xml-name="combine"
-                _in-json-name="combine"
-                gi="combine">
+      <assembly as-type="empty" name="combine" key="combine" gi="combine">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">combine</xsl:attribute>
          </xsl:if>
@@ -1082,19 +811,7 @@
    <xsl:template match="custom"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/merge/custom"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:custom"
-                _step="custom"
-                _key="custom"
-                _key-ref="oscal-profile:custom"
-                _using-name="custom"
-                _in-xml-name="custom"
-                _in-json-name="custom"
-                gi="custom">
+      <assembly name="custom" key="custom" gi="custom">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">custom</xsl:attribute>
          </xsl:if>
@@ -1117,18 +834,7 @@
    <xsl:template match="insert-controls"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:insert-controls"
-                _step="insert-controls"
-                _key="insert-controls"
-                _key-ref="oscal-profile:insert-controls"
-                _using-name="insert-controls"
-                _in-xml-name="insert-controls"
-                _in-json-name="insert-controls"
-                gi="insert-controls">
+      <assembly name="insert-controls" gi="insert-controls">
          <xsl:apply-templates select="@order"/>
          <xsl:apply-templates select="include-all"/>
          <xsl:for-each-group select="include-controls" group-by="true()">
@@ -1150,19 +856,7 @@
    <xsl:template match="modify"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/modify"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:modify"
-                _step="modify"
-                _key="modify"
-                _key-ref="oscal-profile:modify"
-                _using-name="modify"
-                _in-xml-name="modify"
-                _in-json-name="modify"
-                gi="modify">
+      <assembly name="modify" key="modify" gi="modify">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">modify</xsl:attribute>
          </xsl:if>
@@ -1185,18 +879,7 @@
    <xsl:template match="alter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:alter"
-                _step="alter"
-                _key="alters"
-                _key-ref="oscal-profile:alter"
-                _using-name="alter"
-                _in-xml-name="alter"
-                _in-json-name="alters"
-                gi="alter">
+      <assembly name="alter" gi="alter">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="remove" group-by="true()">
             <group in-json="ARRAY" key="removes">
@@ -1217,19 +900,7 @@
    <xsl:template match="remove"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:remove"
-                _step="remove"
-                _key="removes"
-                _key-ref="oscal-profile:remove"
-                _using-name="remove"
-                _in-xml-name="remove"
-                _in-json-name="removes"
-                gi="remove">
+      <assembly as-type="empty" name="remove" gi="remove">
          <xsl:apply-templates select="@by-name"/>
          <xsl:apply-templates select="@by-class"/>
          <xsl:apply-templates select="@by-id"/>
@@ -1239,18 +910,7 @@
    </xsl:template>
    <xsl:template match="add" xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:add"
-                _step="add"
-                _key="adds"
-                _key-ref="oscal-profile:add"
-                _using-name="add"
-                _in-xml-name="add"
-                _in-json-name="adds"
-                gi="add">
+      <assembly name="add" gi="add">
          <xsl:apply-templates select="@position"/>
          <xsl:apply-templates select="@by-id"/>
          <xsl:apply-templates select="title"/>
@@ -1287,13 +947,8 @@
    <xsl:template match="component-definition"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition"
-                _metaschema-json-id="/assembly/oscal-component-definition/component-definition"
-                name="component-definition"
+      <assembly name="component-definition"
                 key="component-definition"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">component-definition</xsl:attribute>
@@ -1331,17 +986,7 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:import-component-definition"
-                _step="import-component-definition"
-                _key="import-component-definitions"
-                _key-ref="oscal-component-definition:import-component-definition"
-                _using-name="import-component-definition"
-                _in-xml-name="import-component-definition"
-                _in-json-name="import-component-definitions"
                 gi="import-component-definition">
          <xsl:apply-templates select="@href"/>
       </assembly>
@@ -1349,18 +994,7 @@
    <xsl:template match="component-definition/component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:defined-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-component-definition:defined-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="defined-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -1407,18 +1041,7 @@
    <xsl:template match="system-implementation/component | local-definitions/component | assessment-assets/component | local-definitions/component | assessment-assets/component | local-definitions/component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-implementation-common:system-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="system-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -1459,18 +1082,7 @@
    <xsl:template match="responsible-role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -1499,18 +1111,7 @@
    <xsl:template match="protocol"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="title"/>
@@ -1526,19 +1127,7 @@
    <xsl:template match="port-range"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
          <xsl:apply-templates select="@end"/>
          <xsl:apply-templates select="@transport"/>
@@ -1547,18 +1136,7 @@
    <xsl:template match="set-parameter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:set-parameter"
-                _step="set-parameter"
-                _key="set-parameters"
-                _key-ref="oscal-implementation-common:set-parameter"
-                _using-name="set-parameter"
-                _in-xml-name="set-parameter"
-                _in-json-name="set-parameters"
-                gi="set-parameter">
+      <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="@param-id"/>
          <xsl:for-each-group select="value" group-by="true()">
             <group in-json="ARRAY" key="values">
@@ -1573,18 +1151,7 @@
    <xsl:template match="capability"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:capability"
-                _step="capability"
-                _key="capabilities"
-                _key-ref="oscal-component-definition:capability"
-                _using-name="capability"
-                _in-xml-name="capability"
-                _in-json-name="capabilities"
-                gi="capability">
+      <assembly name="capability" gi="capability">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="description"/>
@@ -1622,18 +1189,7 @@
    <xsl:template match="incorporates-component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:incorporates-component"
-                _step="incorporates-component"
-                _key="incorporates-components"
-                _key-ref="oscal-component-definition:incorporates-component"
-                _using-name="incorporates-component"
-                _in-xml-name="incorporates-component"
-                _in-json-name="incorporates-components"
-                gi="incorporates-component">
+      <assembly name="incorporates-component" gi="incorporates-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:apply-templates select="description"/>
       </assembly>
@@ -1641,13 +1197,8 @@
    <xsl:template match="system-security-plan"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan"
-                name="system-security-plan"
+      <assembly name="system-security-plan"
                 key="system-security-plan"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-security-plan</xsl:attribute>
@@ -1667,19 +1218,7 @@
    <xsl:template match="import-profile"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/import-profile"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:import-profile"
-                _step="import-profile"
-                _key="import-profile"
-                _key-ref="oscal-ssp:import-profile"
-                _using-name="import-profile"
-                _in-xml-name="import-profile"
-                _in-json-name="import-profile"
-                gi="import-profile">
+      <assembly name="import-profile" key="import-profile" gi="import-profile">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-profile</xsl:attribute>
          </xsl:if>
@@ -1690,18 +1229,8 @@
    <xsl:template match="system-characteristics"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
-                name="system-characteristics"
+      <assembly name="system-characteristics"
                 key="system-characteristics"
-                _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"
-                _key-ref="oscal-ssp:system-characteristics"
-                _using-name="system-characteristics"
-                _in-xml-name="system-characteristics"
-                _in-json-name="system-characteristics"
                 gi="system-characteristics">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-characteristics</xsl:attribute>
@@ -1751,18 +1280,8 @@
    <xsl:template match="system-information"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-information"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-information"
-                name="system-information"
+      <assembly name="system-information"
                 key="system-information"
-                _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"
-                _key-ref="oscal-ssp:system-information"
-                _using-name="system-information"
-                _in-xml-name="system-information"
-                _in-json-name="system-information"
                 gi="system-information">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-information</xsl:attribute>
@@ -1793,18 +1312,8 @@
    <xsl:template match="security-impact-level"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
-                name="security-impact-level"
+      <assembly name="security-impact-level"
                 key="security-impact-level"
-                _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"
-                _key-ref="oscal-ssp:security-impact-level"
-                _using-name="security-impact-level"
-                _in-xml-name="security-impact-level"
-                _in-json-name="security-impact-level"
                 gi="security-impact-level">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-impact-level</xsl:attribute>
@@ -1817,18 +1326,8 @@
    <xsl:template match="authorization-boundary"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
-                name="authorization-boundary"
+      <assembly name="authorization-boundary"
                 key="authorization-boundary"
-                _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"
-                _key-ref="oscal-ssp:authorization-boundary"
-                _using-name="authorization-boundary"
-                _in-xml-name="authorization-boundary"
-                _in-json-name="authorization-boundary"
                 gi="authorization-boundary">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">authorization-boundary</xsl:attribute>
@@ -1861,18 +1360,7 @@
    <xsl:template match="diagram"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:diagram"
-                _step="diagram"
-                _key="diagrams"
-                _key-ref="oscal-ssp:diagram"
-                _using-name="diagram"
-                _in-xml-name="diagram"
-                _in-json-name="diagrams"
-                gi="diagram">
+      <assembly name="diagram" gi="diagram">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1896,18 +1384,8 @@
    <xsl:template match="network-architecture"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
-                name="network-architecture"
+      <assembly name="network-architecture"
                 key="network-architecture"
-                _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"
-                _key-ref="oscal-ssp:network-architecture"
-                _using-name="network-architecture"
-                _in-xml-name="network-architecture"
-                _in-json-name="network-architecture"
                 gi="network-architecture">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">network-architecture</xsl:attribute>
@@ -1940,19 +1418,7 @@
    <xsl:template match="data-flow"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/data-flow"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:data-flow"
-                _step="data-flow"
-                _key="data-flow"
-                _key-ref="oscal-ssp:data-flow"
-                _using-name="data-flow"
-                _in-xml-name="data-flow"
-                _in-json-name="data-flow"
-                gi="data-flow">
+      <assembly name="data-flow" key="data-flow" gi="data-flow">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">data-flow</xsl:attribute>
          </xsl:if>
@@ -1984,18 +1450,8 @@
    <xsl:template match="system-implementation"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
-                name="system-implementation"
+      <assembly name="system-implementation"
                 key="system-implementation"
-                _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"
-                _key-ref="oscal-ssp:system-implementation"
-                _using-name="system-implementation"
-                _in-xml-name="system-implementation"
-                _in-json-name="system-implementation"
                 gi="system-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-implementation</xsl:attribute>
@@ -2048,18 +1504,7 @@
    <xsl:template match="user"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-user"
-                _step="user"
-                _key="users"
-                _key-ref="oscal-implementation-common:system-user"
-                _using-name="user"
-                _in-xml-name="user"
-                _in-json-name="users"
-                gi="user">
+      <assembly name="system-user" gi="user">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -2098,18 +1543,7 @@
    <xsl:template match="authorized-privilege"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:authorized-privilege"
-                _step="authorized-privilege"
-                _key="authorized-privileges"
-                _key-ref="oscal-implementation-common:authorized-privilege"
-                _using-name="authorized-privilege"
-                _in-xml-name="authorized-privilege"
-                _in-json-name="authorized-privileges"
-                gi="authorized-privilege">
+      <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="function-performed" group-by="true()">
@@ -2124,18 +1558,7 @@
    <xsl:template match="inventory-item"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:inventory-item"
-                _step="inventory-item"
-                _key="inventory-items"
-                _key-ref="oscal-implementation-common:inventory-item"
-                _using-name="inventory-item"
-                _in-xml-name="inventory-item"
-                _in-json-name="inventory-items"
-                gi="inventory-item">
+      <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -2172,18 +1595,7 @@
    <xsl:template match="by-component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:by-component"
-                _step="by-component"
-                _key="by-components"
-                _key-ref="oscal-ssp:by-component"
-                _using-name="by-component"
-                _in-xml-name="by-component"
-                _in-json-name="by-components"
-                gi="by-component">
+      <assembly name="by-component" gi="by-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
@@ -2237,18 +1649,8 @@
    <xsl:template match="implementation-status"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/by-component/implementation-status"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/implementation-status"
-                name="implementation-status"
+      <assembly name="implementation-status"
                 key="implementation-status"
-                _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"
-                _key-ref="oscal-implementation-common:implementation-status"
-                _using-name="implementation-status"
-                _in-xml-name="implementation-status"
-                _in-json-name="implementation-status"
                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
@@ -2260,14 +1662,7 @@
    <xsl:template match="assessment-plan"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan"
-                _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/src/metaschema/oscal_assessment-plan_metaschema.xml"
-                _key-name="oscal-ap:assessment-plan"
-                _using-root-name="assessment-plan"
-                gi="assessment-plan">
+      <assembly name="assessment-plan" key="assessment-plan" gi="assessment-plan">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-plan</xsl:attribute>
          </xsl:if>
@@ -2301,19 +1696,7 @@
    <xsl:template match="import-ssp"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/import-ssp"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:import-ssp"
-                _step="import-ssp"
-                _key="import-ssp"
-                _key-ref="oscal-assessment-common:import-ssp"
-                _using-name="import-ssp"
-                _in-xml-name="import-ssp"
-                _in-json-name="import-ssp"
-                gi="import-ssp">
+      <assembly name="import-ssp" key="import-ssp" gi="import-ssp">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-ssp</xsl:attribute>
          </xsl:if>
@@ -2324,18 +1707,7 @@
    <xsl:template match="objectives-and-methods"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:local-objective"
-                _step="objectives-and-methods"
-                _key="objectives-and-methods"
-                _key-ref="oscal-assessment-common:local-objective"
-                _using-name="objectives-and-methods"
-                _in-xml-name="objectives-and-methods"
-                _in-json-name="objectives-and-methods"
-                gi="objectives-and-methods">
+      <assembly name="local-objective" gi="objectives-and-methods">
          <xsl:apply-templates select="@control-id"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -2365,18 +1737,7 @@
    <xsl:template match="activity"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:activity"
-                _step="activity"
-                _key="activities"
-                _key-ref="oscal-assessment-common:activity"
-                _using-name="activity"
-                _in-xml-name="activity"
-                _in-json-name="activities"
-                gi="activity">
+      <assembly name="activity" gi="activity">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -2415,18 +1776,8 @@
    <xsl:template match="reviewed-controls"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/reviewed-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="reviewed-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="reviewed-controls"
-                _in-xml-name="reviewed-controls"
-                _in-json-name="reviewed-controls"
                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
@@ -2467,17 +1818,7 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="include-objective"
-                _key="include-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="include-objective"
-                _in-xml-name="include-objective"
-                _in-json-name="include-objectives"
                 gi="include-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
@@ -2486,17 +1827,7 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="exclude-objective"
-                _key="exclude-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="exclude-objective"
-                _in-xml-name="exclude-objective"
-                _in-json-name="exclude-objectives"
                 gi="exclude-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
@@ -2504,18 +1835,8 @@
    <xsl:template match="related-controls"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/related-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="related-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="related-controls"
-                _in-xml-name="related-controls"
-                _in-json-name="related-controls"
                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
@@ -2555,18 +1876,7 @@
    <xsl:template match="assessment-subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="assessment-subject"
-                _key="assessment-subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="assessment-subject"
-                _in-xml-name="assessment-subject"
-                _in-json-name="assessment-subjects"
-                gi="assessment-subject">
+      <assembly name="assessment-subject" gi="assessment-subject">
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -2604,18 +1914,7 @@
    <xsl:template match="include-subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="include-subject"
-                _key="include-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="include-subject"
-                _in-xml-name="include-subject"
-                _in-json-name="include-subjects"
-                gi="include-subject">
+      <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -2638,18 +1937,7 @@
    <xsl:template match="exclude-subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="exclude-subject"
-                _key="exclude-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="exclude-subject"
-                _in-xml-name="exclude-subject"
-                _in-json-name="exclude-subjects"
-                gi="exclude-subject">
+      <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -2672,18 +1960,8 @@
    <xsl:template match="assessment-assets"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
-                name="assessment-assets"
+      <assembly name="assessment-assets"
                 key="assessment-assets"
-                _base-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"
-                _key-ref="oscal-assessment-common:assessment-assets"
-                _using-name="assessment-assets"
-                _in-xml-name="assessment-assets"
-                _in-json-name="assessment-assets"
                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
@@ -2707,18 +1985,7 @@
    <xsl:template match="task"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="task"
-                _in-xml-name="task"
-                _in-json-name="tasks"
-                gi="task">
+      <assembly name="task" gi="task">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -2779,18 +2046,7 @@
    <xsl:template match="subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -2828,13 +2084,8 @@
    <xsl:template match="assessment-results"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results"
-                _metaschema-json-id="/assembly/oscal-ar/assessment-results"
-                name="assessment-results"
+      <assembly name="assessment-results"
                 key="assessment-results"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-results</xsl:attribute>
@@ -2859,19 +2110,7 @@
    <xsl:template match="import-ap"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/import-ap"
-                _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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:import-ap"
-                _step="import-ap"
-                _key="import-ap"
-                _key-ref="oscal-ar:import-ap"
-                _using-name="import-ap"
-                _in-xml-name="import-ap"
-                _in-json-name="import-ap"
-                gi="import-ap">
+      <assembly name="import-ap" key="import-ap" gi="import-ap">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-ap</xsl:attribute>
          </xsl:if>
@@ -2882,18 +2121,7 @@
    <xsl:template match="result"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:result"
-                _step="result"
-                _key="results"
-                _key-ref="oscal-ar:result"
-                _using-name="result"
-                _in-xml-name="result"
-                _in-json-name="results"
-                gi="result">
+      <assembly name="result" gi="result">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -2950,18 +2178,7 @@
    <xsl:template match="assessment-task"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="assessment-task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="assessment-task"
-                _in-xml-name="assessment-task"
-                _in-json-name="tasks"
-                gi="assessment-task">
+      <assembly name="task" gi="assessment-task">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -3022,19 +2239,7 @@
    <xsl:template match="logged-by"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:logged-by"
-                _step="logged-by"
-                _key="logged-by"
-                _key-ref="oscal-assessment-common:logged-by"
-                _using-name="logged-by"
-                _in-xml-name="logged-by"
-                _in-json-name="logged-by"
-                gi="logged-by">
+      <assembly as-type="empty" name="logged-by" gi="logged-by">
          <xsl:apply-templates select="@party-uuid"/>
          <xsl:apply-templates select="@role-id"/>
       </assembly>
@@ -3042,18 +2247,7 @@
    <xsl:template match="related-task"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:related-task"
-                _step="related-task"
-                _key="related-tasks"
-                _key-ref="oscal-assessment-common:related-task"
-                _using-name="related-task"
-                _in-xml-name="related-task"
-                _in-json-name="related-tasks"
-                gi="related-task">
+      <assembly name="related-task" gi="related-task">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -3090,18 +2284,7 @@
    <xsl:template match="observation"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:observation"
-                _step="observation"
-                _key="observations"
-                _key-ref="oscal-assessment-common:observation"
-                _using-name="observation"
-                _in-xml-name="observation"
-                _in-json-name="observations"
-                gi="observation">
+      <assembly name="observation" gi="observation">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -3162,18 +2345,7 @@
    <xsl:template match="origin"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin"
-                _step="origin"
-                _key="origins"
-                _key-ref="oscal-assessment-common:origin"
-                _using-name="origin"
-                _in-xml-name="origin"
-                _in-json-name="origins"
-                gi="origin">
+      <assembly name="origin" gi="origin">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">origin</xsl:attribute>
          </xsl:if>
@@ -3196,18 +2368,7 @@
    <xsl:template match="actor"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin-actor"
-                _step="actor"
-                _key="actors"
-                _key-ref="oscal-assessment-common:origin-actor"
-                _using-name="actor"
-                _in-xml-name="actor"
-                _in-json-name="actors"
-                gi="actor">
+      <assembly name="origin-actor" gi="actor">
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="@actor-uuid"/>
          <xsl:apply-templates select="@role-id"/>
@@ -3230,18 +2391,7 @@
    <xsl:template match="risk"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:risk"
-                _step="risk"
-                _key="risks"
-                _key-ref="oscal-assessment-common:risk"
-                _using-name="risk"
-                _in-xml-name="risk"
-                _in-json-name="risks"
-                gi="risk">
+      <assembly name="risk" gi="risk">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -3310,18 +2460,7 @@
    <xsl:template match="characterization"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:characterization"
-                _step="characterization"
-                _key="characterizations"
-                _key-ref="oscal-assessment-common:characterization"
-                _using-name="characterization"
-                _in-xml-name="characterization"
-                _in-json-name="characterizations"
-                gi="characterization">
+      <assembly name="characterization" gi="characterization">
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -3349,18 +2488,7 @@
    <xsl:template match="finding"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:finding"
-                _step="finding"
-                _key="findings"
-                _key-ref="oscal-ar:finding"
-                _using-name="finding"
-                _in-xml-name="finding"
-                _in-json-name="findings"
-                gi="finding">
+      <assembly name="finding" gi="finding">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -3407,19 +2535,7 @@
    <xsl:template match="target"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/finding/target"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:finding-target"
-                _step="target"
-                _key="target"
-                _key-ref="oscal-assessment-common:finding-target"
-                _using-name="target"
-                _in-xml-name="target"
-                _in-json-name="target"
-                gi="target">
+      <assembly name="finding-target" key="target" gi="target">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">target</xsl:attribute>
          </xsl:if>
@@ -3449,13 +2565,8 @@
    <xsl:template match="plan-of-action-and-milestones"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones"
-                _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones"
-                name="plan-of-action-and-milestones"
+      <assembly 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/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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">plan-of-action-and-milestones</xsl:attribute>
@@ -3495,18 +2606,8 @@
    <xsl:template match="local-definitions"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
-                _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _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"
-                _key-ref="oscal-poam:local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -3531,18 +2632,7 @@
    <xsl:template match="poam-item"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_poam_metaschema.xml"
-                _key-name="oscal-poam:poam-item"
-                _step="poam-item"
-                _key="poam-items"
-                _key-ref="oscal-poam:poam-item"
-                _using-name="poam-item"
-                _in-xml-name="poam-item"
-                _in-json-name="poam-items"
-                gi="poam-item">
+      <assembly name="poam-item" gi="poam-item">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -3587,21 +2677,11 @@
    <xsl:template match="remarks"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3618,19 +2698,9 @@
    <xsl:template match="location-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -3641,19 +2711,9 @@
    <xsl:template match="party-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -3664,19 +2724,9 @@
    <xsl:template match="value"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/value"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _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"
-             _key-ref="oscal-catalog-common:parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3687,20 +2737,7 @@
    <xsl:template match="hash"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
          <value as-type="string" key="value" in-json="string">
             <xsl:value-of select="."/>
@@ -3710,20 +2747,10 @@
    <xsl:template match="as-is"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-profile/merge/as-is"
-             _metaschema-json-id="/assembly/oscal-profile/merge/as-is"
-             collapsible="no"
+      <field collapsible="no"
              as-type="boolean"
              name="as-is"
              key="as-is"
-             _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"
-             _key-ref="oscal-profile:as-is"
-             _using-name="as-is"
-             _in-xml-name="as-is"
-             _in-json-name="as-is"
              gi="as-is"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3737,19 +2764,9 @@
    <xsl:template match="system-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-id"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-id"
-             _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"
-             _key-ref="oscal-implementation-common:system-id"
-             _using-name="system-id"
-             _in-xml-name="system-id"
-             _in-json-name="system-ids"
              gi="system-id">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-id</xsl:attribute>
@@ -3763,19 +2780,9 @@
    <xsl:template match="role-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/role-id"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/role-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="role-id"
-             _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"
-             _key-ref="oscal-metadata:role-id"
-             _using-name="role-id"
-             _in-xml-name="role-id"
-             _in-json-name="role-ids"
              gi="role-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -3786,19 +2793,9 @@
    <xsl:template match="function-performed"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/function-performed"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/functions-performed"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="function-performed"
-             _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"
-             _key-ref="oscal-implementation-common:function-performed"
-             _using-name="function-performed"
-             _in-xml-name="function-performed"
-             _in-json-name="functions-performed"
              gi="function-performed"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3809,20 +2806,7 @@
    <xsl:template match="threat-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/threat-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/threat-ids"
-             collapsible="no"
-             as-type="uri"
-             name="threat-id"
-             _base-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"
-             _key-ref="oscal-assessment-common:threat-id"
-             _using-name="threat-id"
-             _in-xml-name="threat-id"
-             _in-json-name="threat-ids"
-             gi="threat-id">
+      <field collapsible="no" as-type="uri" name="threat-id" gi="threat-id">
          <xsl:apply-templates select="@system"/>
          <xsl:apply-templates select="@href"/>
          <value as-type="uri" key="id" in-json="string">
@@ -3833,20 +2817,10 @@
    <xsl:template match="status-change"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/status-change"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/status-change"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-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"
-             _key-ref="oscal-assessment-common:risk-status"
-             _using-name="status-change"
-             _in-xml-name="status-change"
-             _in-json-name="status-change"
              gi="status-change"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3861,15 +2835,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-catalog/catalog/uuid"
-            _metaschema-json-id="/assembly/oscal-catalog/catalog/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3878,15 +2845,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -3895,33 +2855,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -3929,15 +2871,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -3946,15 +2881,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -3963,15 +2891,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -3980,15 +2901,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -3997,18 +2911,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -4018,33 +2922,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="role/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -4052,15 +2938,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4069,18 +2948,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -4090,15 +2959,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -4107,15 +2969,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4124,15 +2979,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -4142,15 +2990,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -4159,33 +3000,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -4193,15 +3016,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -4210,18 +3026,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/depends-on"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:depends-on"
-            _step="depends-on"
-            _key="depends-on"
-            _key-ref="oscal-catalog-common:depends-on"
-            _using-name="depends-on"
-            _in-xml-name="depends-on"
-            _in-json-name="depends-on"
             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
@@ -4230,33 +3036,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="how-many"
-            _key="how-many"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
             name="how-many"
             key="how-many"
-            _using-name="how-many"
-            _in-xml-name="how-many"
-            _in-json-name="how-many"
             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="control/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog/control/id"
-            _metaschema-json-id="/assembly/oscal-catalog/control/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -4264,33 +3052,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog/control/class"
-            _metaschema-json-id="/assembly/oscal-catalog/control/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -4298,33 +3068,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/name"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/ns"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -4332,33 +3084,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog/group/id"
-            _metaschema-json-id="/assembly/oscal-catalog/group/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -4366,15 +3100,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog/group/class"
-            _metaschema-json-id="/assembly/oscal-catalog/group/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -4384,15 +3111,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4402,15 +3122,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -4419,18 +3132,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -4439,15 +3142,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -4457,15 +3153,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -4474,18 +3163,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -4494,15 +3173,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-profile/profile/uuid"
-            _metaschema-json-id="/assembly/oscal-profile/profile/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4511,15 +3183,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-profile/import/href"
-            _metaschema-json-id="/assembly/oscal-profile/import/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -4528,18 +3193,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-child-controls"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:with-child-controls"
-            _step="with-child-controls"
-            _key="with-child-controls"
-            _key-ref="oscal-profile:with-child-controls"
-            _using-name="with-child-controls"
-            _in-xml-name="with-child-controls"
-            _in-json-name="with-child-controls"
             gi="with-child-controls">
          <xsl:value-of select="."/>
       </flag>
@@ -4548,18 +3203,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching/pattern"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:pattern"
-            _step="pattern"
-            _key="pattern"
-            _key-ref="oscal-profile:pattern"
-            _using-name="pattern"
-            _in-xml-name="pattern"
-            _in-json-name="pattern"
             gi="pattern">
          <xsl:value-of select="."/>
       </flag>
@@ -4568,36 +3213,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-profile/combine/method"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:method"
-            _step="method"
-            _key="method"
-            _key-ref="oscal-profile:method"
-            _using-name="method"
-            _in-xml-name="method"
-            _in-json-name="method"
             gi="method">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-profile/group/id"
-            _metaschema-json-id="/assembly/oscal-profile/group/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -4605,15 +3229,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-profile/group/class"
-            _metaschema-json-id="/assembly/oscal-profile/group/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -4622,15 +3239,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="order"
-            _key="order"
-            _metaschema-xml-id="/assembly/oscal-profile/insert-controls/order"
-            _metaschema-json-id="/assembly/oscal-profile/insert-controls/order"
             name="order"
             key="order"
-            _using-name="order"
-            _in-xml-name="order"
-            _in-json-name="order"
             gi="order">
          <xsl:value-of select="."/>
       </flag>
@@ -4640,15 +3250,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="param-id"
-            _key="param-id"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/param-id"
-            _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/param-id"
             name="param-id"
             key="param-id"
-            _using-name="param-id"
-            _in-xml-name="param-id"
-            _in-json-name="param-id"
             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
@@ -4658,15 +3261,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/class"
-            _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -4675,18 +3271,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/depends-on"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:depends-on"
-            _step="depends-on"
-            _key="depends-on"
-            _key-ref="oscal-catalog-common:depends-on"
-            _using-name="depends-on"
-            _in-xml-name="depends-on"
-            _in-json-name="depends-on"
             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
@@ -4695,18 +3281,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/alter/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -4715,15 +3291,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-name"
-            _key="by-name"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-name"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-name"
             name="by-name"
             key="by-name"
-            _using-name="by-name"
-            _in-xml-name="by-name"
-            _in-json-name="by-name"
             gi="by-name">
          <xsl:value-of select="."/>
       </flag>
@@ -4732,15 +3301,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-class"
-            _key="by-class"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-class"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-class"
             name="by-class"
             key="by-class"
-            _using-name="by-class"
-            _in-xml-name="by-class"
-            _in-json-name="by-class"
             gi="by-class">
          <xsl:value-of select="."/>
       </flag>
@@ -4749,15 +3311,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-id"
-            _key="by-id"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-id"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-id"
             name="by-id"
             key="by-id"
-            _using-name="by-id"
-            _in-xml-name="by-id"
-            _in-json-name="by-id"
             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
@@ -4766,15 +3321,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-item-name"
-            _key="by-item-name"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-item-name"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-item-name"
             name="by-item-name"
             key="by-item-name"
-            _using-name="by-item-name"
-            _in-xml-name="by-item-name"
-            _in-json-name="by-item-name"
             gi="by-item-name">
          <xsl:value-of select="."/>
       </flag>
@@ -4783,15 +3331,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-ns"
-            _key="by-ns"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-ns"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-ns"
             name="by-ns"
             key="by-ns"
-            _using-name="by-ns"
-            _in-xml-name="by-ns"
-            _in-json-name="by-ns"
             gi="by-ns">
          <xsl:value-of select="."/>
       </flag>
@@ -4800,15 +3341,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="position"
-            _key="position"
-            _metaschema-xml-id="/assembly/oscal-profile/add/position"
-            _metaschema-json-id="/assembly/oscal-profile/add/position"
             name="position"
             key="position"
-            _using-name="position"
-            _in-xml-name="position"
-            _in-json-name="position"
             gi="position">
          <xsl:value-of select="."/>
       </flag>
@@ -4817,15 +3351,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-id"
-            _key="by-id"
-            _metaschema-xml-id="/assembly/oscal-profile/add/by-id"
-            _metaschema-json-id="/assembly/oscal-profile/add/by-id"
             name="by-id"
             key="by-id"
-            _using-name="by-id"
-            _in-xml-name="by-id"
-            _in-json-name="by-id"
             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
@@ -4834,15 +3361,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/component-definition/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4851,15 +3371,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-component-definition/import-component-definition/href"
-            _metaschema-json-id="/assembly/oscal-component-definition/import-component-definition/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -4868,15 +3381,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/defined-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4885,18 +3391,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/type"
-            _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/src/metaschema/oscal_component_metaschema.xml"
-            _key-name="oscal-component-definition:defined-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-component-definition:defined-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -4905,15 +3401,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -4922,15 +3411,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4939,15 +3421,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -4956,15 +3431,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -4973,15 +3441,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -4990,15 +3451,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -5008,15 +3462,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5025,18 +3472,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/source"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:source"
-            _step="source"
-            _key="source"
-            _key-ref="oscal-implementation-common:source"
-            _using-name="source"
-            _in-xml-name="source"
-            _in-json-name="source"
             gi="source">
          <xsl:value-of select="."/>
       </flag>
@@ -5045,18 +3482,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/param-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:param-id"
-            _step="param-id"
-            _key="param-id"
-            _key-ref="oscal-implementation-common:param-id"
-            _using-name="param-id"
-            _in-xml-name="param-id"
-            _in-json-name="param-id"
             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5066,15 +3493,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5083,18 +3503,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5103,18 +3513,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-component-definition/statement/statement-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:statement-id"
-            _step="statement-id"
-            _key="statement-id"
-            _key-ref="oscal-implementation-common:statement-id"
-            _using-name="statement-id"
-            _in-xml-name="statement-id"
-            _in-json-name="statement-id"
             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5124,15 +3524,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/statement/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/statement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5141,15 +3534,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/capability/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/capability/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5158,15 +3544,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-component-definition/capability/name"
-            _metaschema-json-id="/assembly/oscal-component-definition/capability/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -5175,15 +3554,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/incorporates-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/incorporates-component/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5192,15 +3564,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5209,15 +3574,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-ssp/import-profile/href"
-            _metaschema-json-id="/assembly/oscal-ssp/import-profile/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -5226,15 +3584,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="identifier-type"
-            _key="identifier-type"
-            _metaschema-xml-id="/field/oscal-implementation-common/system-id/identifier-type"
-            _metaschema-json-id="/field/oscal-implementation-common/system-id/identifier-type"
             name="identifier-type"
             key="identifier-type"
-            _using-name="identifier-type"
-            _in-xml-name="identifier-type"
-            _in-json-name="identifier-type"
             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
@@ -5244,15 +3595,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5262,15 +3606,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization/system"
-            _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -5280,15 +3617,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-ssp/status/state"
-            _metaschema-json-id="/assembly/oscal-ssp/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -5297,15 +3627,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/diagram/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/diagram/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5315,15 +3638,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5332,15 +3648,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-user/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5349,15 +3658,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5366,18 +3668,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/type"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:system-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-implementation-common:system-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -5387,15 +3679,8 @@
                  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-implementation-common/system-component/status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -5404,15 +3689,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5422,15 +3700,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5440,15 +3711,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5457,18 +3721,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5477,18 +3731,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-ssp/statement/statement-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:statement-id"
-            _step="statement-id"
-            _key="statement-id"
-            _key-ref="oscal-implementation-common:statement-id"
-            _using-name="statement-id"
-            _in-xml-name="statement-id"
-            _in-json-name="statement-id"
             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5498,15 +3742,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/statement/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/statement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5515,15 +3752,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5532,15 +3762,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5549,15 +3772,8 @@
                  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-implementation-common/implementation-status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/implementation-status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -5567,15 +3783,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5585,15 +3794,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5602,18 +3804,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/provided-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:provided-uuid"
-            _step="provided-uuid"
-            _key="provided-uuid"
-            _key-ref="oscal-ssp:provided-uuid"
-            _using-name="provided-uuid"
-            _in-xml-name="provided-uuid"
-            _in-json-name="provided-uuid"
             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5623,15 +3815,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5640,18 +3825,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/provided-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:provided-uuid"
-            _step="provided-uuid"
-            _key="provided-uuid"
-            _key-ref="oscal-ssp:provided-uuid"
-            _using-name="provided-uuid"
-            _in-xml-name="provided-uuid"
-            _in-json-name="provided-uuid"
             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5661,15 +3836,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5678,18 +3846,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/responsibility-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:responsibility-uuid"
-            _step="responsibility-uuid"
-            _key="responsibility-uuid"
-            _key-ref="oscal-ssp:responsibility-uuid"
-            _using-name="responsibility-uuid"
-            _in-xml-name="responsibility-uuid"
-            _in-json-name="responsibility-uuid"
             gi="responsibility-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5698,15 +3856,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/uuid"
-            _metaschema-json-id="/assembly/oscal-ap/assessment-plan/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5715,15 +3866,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/import-ssp/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/import-ssp/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -5732,18 +3876,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5752,15 +3886,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5770,15 +3897,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5787,18 +3907,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5807,18 +3917,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:objective-id"
-            _step="objective-id"
-            _key="objective-id"
-            _key-ref="oscal-assessment-common:objective-id"
-            _using-name="objective-id"
-            _in-xml-name="objective-id"
-            _in-json-name="objective-id"
             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5827,15 +3927,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5844,33 +3937,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -5878,15 +3953,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/class"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -5895,15 +3963,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -5912,18 +3973,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5932,18 +3983,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -5953,15 +3994,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5971,15 +4005,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5988,15 +4015,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6005,15 +4025,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -6023,15 +4036,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="date"
-            _key="date"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
             name="date"
             key="date"
-            _using-name="date"
-            _in-xml-name="date"
-            _in-json-name="date"
             gi="date">
          <xsl:value-of select="."/>
       </flag>
@@ -6041,15 +4047,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -6059,15 +4058,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -6077,15 +4069,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="positiveInteger"
-            _step="period"
-            _key="period"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
             name="period"
             key="period"
-            _using-name="period"
-            _in-xml-name="period"
-            _in-json-name="period"
             gi="period">
          <xsl:value-of select="."/>
       </flag>
@@ -6095,15 +4080,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="unit"
-            _key="unit"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
             name="unit"
             key="unit"
-            _using-name="unit"
-            _in-xml-name="unit"
-            _in-json-name="unit"
             gi="unit">
          <xsl:value-of select="."/>
       </flag>
@@ -6113,15 +4091,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6131,15 +4102,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="activity-uuid"
-            _key="activity-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/activity-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/activity-uuid"
             name="activity-uuid"
             key="activity-uuid"
-            _using-name="activity-uuid"
-            _in-xml-name="activity-uuid"
-            _in-json-name="activity-uuid"
             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6148,15 +4112,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/assessment-results/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/assessment-results/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6165,15 +4122,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-ar/import-ap/href"
-            _metaschema-json-id="/assembly/oscal-ar/import-ap/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -6182,15 +4132,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/result/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/result/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6200,15 +4143,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6217,15 +4153,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="party-uuid"
-            _key="party-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
             name="party-uuid"
             key="party-uuid"
-            _using-name="party-uuid"
-            _in-xml-name="party-uuid"
-            _in-json-name="party-uuid"
             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6234,15 +4163,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -6251,15 +4173,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6269,15 +4184,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="subject-placeholder-uuid"
-            _key="subject-placeholder-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
             name="subject-placeholder-uuid"
             key="subject-placeholder-uuid"
-            _using-name="subject-placeholder-uuid"
-            _in-xml-name="subject-placeholder-uuid"
-            _in-json-name="subject-placeholder-uuid"
             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6286,15 +4194,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6303,15 +4204,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -6320,15 +4214,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="actor-uuid"
-            _key="actor-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
             name="actor-uuid"
             key="actor-uuid"
-            _using-name="actor-uuid"
-            _in-xml-name="actor-uuid"
-            _in-json-name="actor-uuid"
             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6337,15 +4224,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -6354,18 +4234,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6374,18 +4244,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -6395,15 +4255,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -6412,15 +4265,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6429,15 +4275,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/system"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -6446,15 +4285,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/href"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -6464,15 +4296,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -6482,15 +4307,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/system"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -6500,15 +4318,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/value"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -6518,15 +4329,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6536,15 +4340,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="implementation-uuid"
-            _key="implementation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/implementation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/implementation-uuid"
             name="implementation-uuid"
             key="implementation-uuid"
-            _using-name="implementation-uuid"
-            _in-xml-name="implementation-uuid"
-            _in-json-name="implementation-uuid"
             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6554,15 +4351,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6572,15 +4362,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="lifecycle"
-            _key="lifecycle"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/lifecycle"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/lifecycle"
             name="lifecycle"
             key="lifecycle"
-            _using-name="lifecycle"
-            _in-xml-name="lifecycle"
-            _in-json-name="lifecycle"
             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
@@ -6590,15 +4373,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6608,15 +4384,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6626,15 +4395,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="response-uuid"
-            _key="response-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response/response-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses/response-uuid"
             name="response-uuid"
             key="response-uuid"
-            _using-name="response-uuid"
-            _in-xml-name="response-uuid"
-            _in-json-name="response-uuid"
             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6644,15 +4406,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6661,15 +4416,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6678,15 +4426,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -6695,15 +4436,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="target-id"
-            _key="target-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/target-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/target-id"
             name="target-id"
             key="target-id"
-            _using-name="target-id"
-            _in-xml-name="target-id"
-            _in-json-name="target-id"
             gi="target-id">
          <xsl:value-of select="."/>
       </flag>
@@ -6713,15 +4447,8 @@
                  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>
@@ -6731,15 +4458,8 @@
                  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>
@@ -6749,15 +4469,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6767,15 +4480,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="risk-uuid"
-            _key="risk-uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/associated-risk/risk-uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/related-risks/risk-uuid"
             name="risk-uuid"
             key="risk-uuid"
-            _using-name="risk-uuid"
-            _in-xml-name="risk-uuid"
-            _in-json-name="risk-uuid"
             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6784,15 +4490,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/uuid"
-            _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6801,15 +4500,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6819,15 +4511,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6837,15 +4522,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="risk-uuid"
-            _key="risk-uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/associated-risk/risk-uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/related-risks/risk-uuid"
             name="risk-uuid"
             key="risk-uuid"
-            _using-name="risk-uuid"
-            _in-xml-name="risk-uuid"
-            _in-json-name="risk-uuid"
             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -6854,17 +4532,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6879,20 +4550,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6907,20 +4568,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6935,20 +4586,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6963,20 +4604,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6991,18 +4622,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -7033,10 +4653,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -7047,17 +4664,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7072,20 +4682,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7100,20 +4700,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7128,20 +4718,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7156,20 +4736,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7184,17 +4754,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7209,19 +4772,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -7233,17 +4786,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7258,17 +4804,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7283,17 +4822,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7308,18 +4840,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7337,17 +4862,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7362,17 +4880,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7387,19 +4898,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -7421,19 +4920,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -7445,17 +4934,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7470,17 +4952,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7495,17 +4970,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7520,17 +4988,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7545,19 +5006,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -7569,19 +5020,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -7593,16 +5034,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -7614,17 +5048,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7639,17 +5066,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7664,17 +5084,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7689,16 +5102,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -7710,17 +5116,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7735,19 +5134,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -7759,19 +5148,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -7783,18 +5162,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -7813,19 +5181,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -7837,17 +5195,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7862,17 +5213,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7887,17 +5231,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7912,17 +5249,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7937,16 +5267,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -7958,17 +5281,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7983,17 +5299,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8008,17 +5317,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8033,18 +5335,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8062,18 +5357,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8091,15 +5379,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -8108,17 +5388,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8133,16 +5406,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -8154,17 +5420,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/control/title"
-             _metaschema-json-id="/assembly/oscal-catalog/control/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8179,17 +5438,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8204,17 +5456,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8229,18 +5474,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8258,18 +5496,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8287,15 +5518,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -8304,17 +5527,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8329,16 +5545,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -8350,17 +5559,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8375,17 +5577,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8400,17 +5595,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8425,17 +5613,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/group/title"
-             _metaschema-json-id="/assembly/oscal-catalog/group/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8450,17 +5631,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8475,17 +5649,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8500,18 +5667,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8529,18 +5689,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8558,15 +5711,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -8575,17 +5720,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8600,16 +5738,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -8621,17 +5752,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8646,17 +5770,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8671,17 +5788,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8696,17 +5806,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/control/title"
-             _metaschema-json-id="/assembly/oscal-catalog/control/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8721,17 +5824,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8746,17 +5842,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8771,18 +5860,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8800,18 +5882,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8829,15 +5904,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -8846,17 +5913,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8871,16 +5931,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -8892,17 +5945,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8917,17 +5963,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8942,17 +5981,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8967,15 +5999,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -9009,17 +6033,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9034,18 +6051,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9063,19 +6073,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -9087,16 +6087,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -9121,17 +6112,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9146,17 +6130,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9171,15 +6148,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -9195,17 +6164,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -9221,17 +6183,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9246,20 +6201,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9274,20 +6219,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9302,20 +6237,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9330,20 +6255,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9358,18 +6273,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -9400,10 +6304,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -9414,17 +6315,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9439,20 +6333,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9467,20 +6351,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9495,20 +6369,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9523,20 +6387,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9551,17 +6405,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9576,19 +6423,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -9600,17 +6437,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9625,17 +6455,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9650,17 +6473,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9675,18 +6491,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9704,17 +6513,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9729,17 +6531,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9754,19 +6549,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -9788,19 +6571,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -9812,17 +6585,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9837,17 +6603,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9862,17 +6621,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9887,17 +6639,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9912,19 +6657,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -9936,19 +6671,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -9960,16 +6685,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -9981,17 +6699,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10006,17 +6717,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10031,17 +6735,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10056,16 +6753,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -10077,17 +6767,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10102,19 +6785,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -10126,19 +6799,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -10150,18 +6813,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -10180,19 +6832,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -10204,17 +6846,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10229,17 +6864,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10254,17 +6882,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10279,17 +6900,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10304,16 +6918,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -10325,17 +6932,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10350,18 +6950,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -10383,16 +6972,9 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -10404,16 +6986,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -10421,18 +6994,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -10454,16 +7016,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -10475,16 +7030,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -10492,17 +7038,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-profile/group/title"
-             _metaschema-json-id="/assembly/oscal-profile/group/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10517,17 +7056,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10542,17 +7074,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10567,18 +7092,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10596,18 +7114,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10625,15 +7136,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -10642,17 +7145,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10667,16 +7163,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -10688,17 +7177,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10713,17 +7195,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10738,17 +7213,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10763,18 +7231,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -10796,16 +7253,9 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -10817,16 +7267,7 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -10834,18 +7275,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -10867,16 +7297,9 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -10888,16 +7311,7 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -10905,18 +7319,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -10938,16 +7341,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -10959,16 +7355,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -10976,18 +7363,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -11009,16 +7385,9 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -11030,16 +7399,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -11047,15 +7407,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="set-parameter"
-                _key="set-parameters"
-                _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter"
-                _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters"
-                name="set-parameter"
-                _using-name="set-parameter"
-                _in-xml-name="set-parameter"
-                _in-json-name="set-parameters"
-                gi="set-parameter">
+      <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="@param-id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="@depends-on"/>
@@ -11103,17 +7455,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11128,17 +7473,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/label"
-             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11153,18 +7491,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/usage"
-             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11182,18 +7513,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11211,15 +7535,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -11228,17 +7544,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11253,16 +7562,9 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -11274,17 +7576,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-profile/add/title"
-             _metaschema-json-id="/assembly/oscal-profile/add/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11299,17 +7594,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11324,17 +7612,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11349,18 +7630,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11378,18 +7652,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11407,15 +7674,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -11424,17 +7683,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11449,16 +7701,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -11470,17 +7715,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11495,17 +7733,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11520,17 +7751,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11545,15 +7769,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -11587,17 +7803,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11612,18 +7821,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11641,19 +7843,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -11665,16 +7857,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -11699,17 +7882,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11724,17 +7900,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11749,15 +7918,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -11773,17 +7934,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -11799,17 +7953,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11824,20 +7971,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11852,20 +7989,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11880,20 +8007,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11908,20 +8025,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11936,18 +8043,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -11978,10 +8074,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -11992,17 +8085,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12017,20 +8103,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12045,20 +8121,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12073,20 +8139,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12101,20 +8157,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12129,17 +8175,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12154,19 +8193,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -12178,17 +8207,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12203,17 +8225,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12228,17 +8243,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12253,18 +8261,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12282,17 +8283,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12307,17 +8301,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12332,19 +8319,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -12366,19 +8341,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -12390,17 +8355,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12415,17 +8373,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12440,17 +8391,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12465,17 +8409,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12490,19 +8427,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -12514,19 +8441,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -12538,16 +8455,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -12559,17 +8469,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12584,17 +8487,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12609,17 +8505,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12634,16 +8523,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -12655,17 +8537,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12680,19 +8555,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -12704,19 +8569,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -12728,18 +8583,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -12758,19 +8602,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -12782,17 +8616,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12807,17 +8634,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12832,17 +8652,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12857,17 +8670,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12882,16 +8688,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -12903,17 +8702,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12928,17 +8720,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/title"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12953,18 +8738,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12982,17 +8760,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/purpose"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13007,17 +8778,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13032,17 +8796,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13057,17 +8814,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13082,18 +8832,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:control-implementation"
-                _step="control-implementation"
-                _key="control-implementations"
-                _key-ref="oscal-component-definition:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementations"
-                gi="control-implementation">
+      <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@source"/>
          <xsl:apply-templates select="description"/>
@@ -13131,18 +8870,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13160,17 +8892,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13185,16 +8910,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -13206,18 +8924,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-component-definition:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@control-id"/>
          <xsl:apply-templates select="description"/>
@@ -13263,18 +8970,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13292,17 +8992,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13317,16 +9010,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -13338,17 +9024,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13363,18 +9042,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-component-definition:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
@@ -13406,18 +9074,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/statement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/statement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13435,17 +9096,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13460,17 +9114,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13485,18 +9132,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/capability/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/capability/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13514,17 +9154,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13539,18 +9172,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/incorporates-component/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/incorporates-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13568,18 +9194,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:control-implementation"
-                _step="control-implementation"
-                _key="control-implementations"
-                _key-ref="oscal-component-definition:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementations"
-                gi="control-implementation">
+      <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@source"/>
          <xsl:apply-templates select="description"/>
@@ -13617,18 +9232,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13646,17 +9254,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13671,16 +9272,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -13692,18 +9286,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-component-definition:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@control-id"/>
          <xsl:apply-templates select="description"/>
@@ -13749,18 +9332,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13778,17 +9354,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13803,16 +9372,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -13824,17 +9386,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13849,18 +9404,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-component-definition:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
@@ -13892,18 +9436,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/statement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/statement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13921,17 +9458,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13946,17 +9476,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13971,15 +9494,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -14013,17 +9528,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14038,18 +9546,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14067,19 +9568,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -14091,16 +9582,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -14125,17 +9607,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14150,17 +9625,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14175,15 +9643,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -14199,17 +9659,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -14225,17 +9678,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14250,20 +9696,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14278,20 +9714,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14306,20 +9732,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14334,20 +9750,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14362,18 +9768,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -14404,10 +9799,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -14418,17 +9810,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14443,20 +9828,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14471,20 +9846,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14499,20 +9864,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14527,20 +9882,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14555,17 +9900,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14580,19 +9918,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -14604,17 +9932,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14629,17 +9950,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14654,17 +9968,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14679,18 +9986,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14708,17 +10008,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14733,17 +10026,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14758,19 +10044,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -14792,19 +10066,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -14816,17 +10080,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14841,17 +10098,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14866,17 +10116,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14891,17 +10134,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14916,19 +10152,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -14940,19 +10166,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -14964,16 +10180,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -14985,17 +10194,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15010,17 +10212,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15035,17 +10230,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15060,16 +10248,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -15081,17 +10262,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15106,19 +10280,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -15130,19 +10294,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -15154,18 +10308,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -15184,19 +10327,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -15208,17 +10341,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15233,17 +10359,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15258,17 +10377,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15283,17 +10395,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15308,16 +10413,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -15329,17 +10427,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15354,17 +10445,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="system-name"
-             _key="system-name"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-name"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-name"
              key="system-name"
-             _using-name="system-name"
-             _in-xml-name="system-name"
-             _in-json-name="system-name"
              gi="system-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15379,17 +10463,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="system-name-short"
-             _key="system-name-short"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-name-short"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-name-short"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-name-short"
              key="system-name-short"
-             _using-name="system-name-short"
-             _in-xml-name="system-name-short"
-             _in-json-name="system-name-short"
              gi="system-name-short"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15404,18 +10481,11 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/description"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15433,17 +10503,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15458,20 +10521,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/date-authorized"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/date-authorized"
-             collapsible="no"
+      <field collapsible="no"
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _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"
-             _key-ref="oscal-ssp:date-authorized"
-             _using-name="date-authorized"
-             _in-xml-name="date-authorized"
-             _in-json-name="date-authorized"
              gi="date-authorized"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15486,17 +10539,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="security-sensitivity-level"
-             _key="security-sensitivity-level"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/security-sensitivity-level"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-sensitivity-level"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-sensitivity-level"
              key="security-sensitivity-level"
-             _using-name="security-sensitivity-level"
-             _in-xml-name="security-sensitivity-level"
-             _in-json-name="security-sensitivity-level"
              gi="security-sensitivity-level"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15511,17 +10557,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15536,15 +10575,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="information-type"
-                _key="information-types"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types"
-                name="information-type"
-                _using-name="information-type"
-                _in-xml-name="information-type"
-                _in-json-name="information-types"
-                gi="information-type">
+      <assembly name="information-type" gi="information-type">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -15578,17 +10609,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/title"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15603,18 +10627,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/description"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15632,15 +10649,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="categorization"
-                _key="categorizations"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations"
-                name="categorization"
-                _using-name="categorization"
-                _in-xml-name="categorization"
-                _in-json-name="categorizations"
-                gi="categorization">
+      <assembly name="categorization" gi="categorization">
          <xsl:apply-templates select="@system"/>
          <xsl:for-each-group select="information-type-id" group-by="true()">
             <group in-json="ARRAY" key="information-type-ids">
@@ -15655,16 +10664,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="information-type-id"
-             _key="information-type-ids"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization/information-type-id"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations/information-type-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="information-type-id"
-             _using-name="information-type-id"
-             _in-xml-name="information-type-id"
-             _in-json-name="information-type-ids"
              gi="information-type-id"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -15676,17 +10678,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15701,15 +10696,8 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="confidentiality-impact"
-                _key="confidentiality-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact"
-                name="confidentiality-impact"
+      <assembly name="confidentiality-impact"
                 key="confidentiality-impact"
-                _using-name="confidentiality-impact"
-                _in-xml-name="confidentiality-impact"
-                _in-json-name="confidentiality-impact"
                 gi="confidentiality-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
@@ -15737,17 +10725,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15762,20 +10743,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15790,20 +10761,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15818,21 +10779,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15850,15 +10801,8 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="integrity-impact"
-                _key="integrity-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact"
-                name="integrity-impact"
+      <assembly name="integrity-impact"
                 key="integrity-impact"
-                _using-name="integrity-impact"
-                _in-xml-name="integrity-impact"
-                _in-json-name="integrity-impact"
                 gi="integrity-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">integrity-impact</xsl:attribute>
@@ -15886,17 +10830,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15911,20 +10848,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15939,20 +10866,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15967,21 +10884,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15999,15 +10906,8 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="availability-impact"
-                _key="availability-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact"
-                name="availability-impact"
+      <assembly name="availability-impact"
                 key="availability-impact"
-                _using-name="availability-impact"
-                _in-xml-name="availability-impact"
-                _in-json-name="availability-impact"
                 gi="availability-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">availability-impact</xsl:attribute>
@@ -16035,17 +10935,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16060,20 +10953,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16088,20 +10971,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16116,21 +10989,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16148,17 +11011,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="security-objective-confidentiality"
-             _key="security-objective-confidentiality"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-confidentiality"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-confidentiality"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-confidentiality"
              key="security-objective-confidentiality"
-             _using-name="security-objective-confidentiality"
-             _in-xml-name="security-objective-confidentiality"
-             _in-json-name="security-objective-confidentiality"
              gi="security-objective-confidentiality"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16173,17 +11029,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="security-objective-integrity"
-             _key="security-objective-integrity"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-integrity"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-integrity"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-integrity"
              key="security-objective-integrity"
-             _using-name="security-objective-integrity"
-             _in-xml-name="security-objective-integrity"
-             _in-json-name="security-objective-integrity"
              gi="security-objective-integrity"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16198,17 +11047,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="security-objective-availability"
-             _key="security-objective-availability"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-availability"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-availability"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-availability"
              key="security-objective-availability"
-             _using-name="security-objective-availability"
-             _in-xml-name="security-objective-availability"
-             _in-json-name="security-objective-availability"
              gi="security-objective-availability"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16223,19 +11065,7 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/status"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:status"
-                _step="status"
-                _key="status"
-                _key-ref="oscal-ssp:status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -16247,18 +11077,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/description"
-             _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16276,17 +11099,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16301,18 +11117,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16330,17 +11139,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16355,17 +11157,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16380,18 +11175,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16409,18 +11197,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16438,18 +11219,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/network-architecture/description"
-             _metaschema-json-id="/assembly/oscal-ssp/network-architecture/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16467,17 +11241,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16492,18 +11259,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16521,17 +11281,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16546,17 +11299,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16571,18 +11317,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16600,18 +11339,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/data-flow/description"
-             _metaschema-json-id="/assembly/oscal-ssp/data-flow/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16629,17 +11361,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16654,18 +11379,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16683,17 +11401,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16708,17 +11419,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16733,18 +11437,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16762,17 +11459,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16787,17 +11477,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16812,15 +11495,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="leveraged-authorization"
-                _key="leveraged-authorizations"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization"
-                _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations"
-                name="leveraged-authorization"
-                _using-name="leveraged-authorization"
-                _in-xml-name="leveraged-authorization"
-                _in-json-name="leveraged-authorizations"
-                gi="leveraged-authorization">
+      <assembly name="leveraged-authorization" gi="leveraged-authorization">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -16846,17 +11521,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/title"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16871,17 +11539,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16896,17 +11557,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="party-uuid"
-             _key="party-uuid"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/party-uuid"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/party-uuid"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
              key="party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuid"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16921,20 +11575,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/date-authorized"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/date-authorized"
-             collapsible="no"
+      <field collapsible="no"
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _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"
-             _key-ref="oscal-ssp:date-authorized"
-             _using-name="date-authorized"
-             _in-xml-name="date-authorized"
-             _in-json-name="date-authorized"
              gi="date-authorized"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16949,17 +11593,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16974,17 +11611,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16999,18 +11629,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17028,17 +11651,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17053,17 +11669,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17078,18 +11687,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17107,17 +11709,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17132,18 +11727,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17161,17 +11749,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17186,17 +11767,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17211,16 +11785,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -17232,17 +11797,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17257,17 +11815,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17282,18 +11833,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17311,17 +11855,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17336,17 +11873,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17361,15 +11891,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -17399,17 +11921,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17424,17 +11939,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17449,18 +11957,8 @@
                  priority="3"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
-                name="control-implementation"
+      <assembly name="control-implementation"
                 key="control-implementation"
-                _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"
-                _key-ref="oscal-ssp:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementation"
                 gi="control-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">control-implementation</xsl:attribute>
@@ -17486,18 +11984,11 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-ssp/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17515,16 +12006,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -17536,18 +12020,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-ssp:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -17599,17 +12072,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17624,16 +12090,9 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -17645,17 +12104,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17670,18 +12122,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-ssp:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -17719,17 +12160,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17744,17 +12178,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17769,18 +12196,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17798,17 +12218,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17823,16 +12236,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -17844,16 +12250,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="export"
-                _key="export"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export"
-                name="export"
-                key="export"
-                _using-name="export"
-                _in-xml-name="export"
-                _in-json-name="export"
-                gi="export">
+      <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">export</xsl:attribute>
          </xsl:if>
@@ -17893,18 +12290,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17922,17 +12312,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17947,15 +12330,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="provided"
-                _key="provided"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided"
-                name="provided"
-                _using-name="provided"
-                _in-xml-name="provided"
-                _in-json-name="provided"
-                gi="provided">
+      <assembly name="provided" gi="provided">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -17986,18 +12361,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18015,17 +12383,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18040,17 +12401,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18065,15 +12419,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="responsibility"
-                _key="responsibilities"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities"
-                name="responsibility"
-                _using-name="responsibility"
-                _in-xml-name="responsibility"
-                _in-json-name="responsibilities"
-                gi="responsibility">
+      <assembly name="responsibility" gi="responsibility">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@provided-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -18105,18 +12451,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18134,17 +12473,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18159,17 +12491,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18184,15 +12509,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="inherited"
-                _key="inherited"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited"
-                name="inherited"
-                _using-name="inherited"
-                _in-xml-name="inherited"
-                _in-json-name="inherited"
-                gi="inherited">
+      <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@provided-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -18223,18 +12540,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18252,17 +12562,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18277,17 +12580,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18302,15 +12598,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="satisfied"
-                _key="satisfied"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied"
-                name="satisfied"
-                _using-name="satisfied"
-                _in-xml-name="satisfied"
-                _in-json-name="satisfied"
-                gi="satisfied">
+      <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@responsibility-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -18342,18 +12630,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18371,17 +12652,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18396,17 +12670,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18421,17 +12688,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18446,18 +12706,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18475,17 +12728,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18500,16 +12746,9 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -18521,16 +12760,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="export"
-                _key="export"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export"
-                name="export"
-                key="export"
-                _using-name="export"
-                _in-xml-name="export"
-                _in-json-name="export"
-                gi="export">
+      <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">export</xsl:attribute>
          </xsl:if>
@@ -18570,18 +12800,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18599,17 +12822,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18624,15 +12840,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="provided"
-                _key="provided"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided"
-                name="provided"
-                _using-name="provided"
-                _in-xml-name="provided"
-                _in-json-name="provided"
-                gi="provided">
+      <assembly name="provided" gi="provided">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -18663,18 +12871,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18692,17 +12893,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18717,17 +12911,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18742,15 +12929,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="responsibility"
-                _key="responsibilities"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities"
-                name="responsibility"
-                _using-name="responsibility"
-                _in-xml-name="responsibility"
-                _in-json-name="responsibilities"
-                gi="responsibility">
+      <assembly name="responsibility" gi="responsibility">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@provided-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -18782,18 +12961,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18811,17 +12983,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18836,17 +13001,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18861,15 +13019,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="inherited"
-                _key="inherited"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited"
-                name="inherited"
-                _using-name="inherited"
-                _in-xml-name="inherited"
-                _in-json-name="inherited"
-                gi="inherited">
+      <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@provided-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -18900,18 +13050,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18929,17 +13072,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18954,17 +13090,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18979,15 +13108,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="satisfied"
-                _key="satisfied"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied"
-                name="satisfied"
-                _using-name="satisfied"
-                _in-xml-name="satisfied"
-                _in-json-name="satisfied"
-                gi="satisfied">
+      <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@responsibility-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -19019,18 +13140,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19048,17 +13162,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19073,17 +13180,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19098,17 +13198,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19123,15 +13216,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -19165,17 +13250,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19190,18 +13268,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19219,19 +13290,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -19243,16 +13304,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -19277,17 +13329,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19302,17 +13347,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19327,15 +13365,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -19351,17 +13381,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -19377,17 +13400,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19402,20 +13418,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19430,20 +13436,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19458,20 +13454,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19486,20 +13472,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19514,18 +13490,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -19556,10 +13521,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -19570,17 +13532,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19595,20 +13550,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19623,20 +13568,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19651,20 +13586,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19679,20 +13604,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19707,17 +13622,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19732,19 +13640,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -19756,17 +13654,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19781,17 +13672,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19806,17 +13690,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19831,18 +13708,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19860,17 +13730,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19885,17 +13748,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19910,19 +13766,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -19944,19 +13788,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -19968,17 +13802,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19993,17 +13820,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20018,17 +13838,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20043,17 +13856,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20068,19 +13874,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -20092,19 +13888,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -20116,16 +13902,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -20137,17 +13916,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20162,17 +13934,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20187,17 +13952,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20212,16 +13970,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -20233,17 +13984,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20258,19 +14002,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -20282,19 +14016,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -20306,18 +14030,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -20336,19 +14049,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -20360,17 +14063,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20385,17 +14081,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20410,17 +14099,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20435,17 +14117,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20460,16 +14135,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -20481,17 +14149,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20506,15 +14167,8 @@
                  priority="3"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -20561,17 +14215,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20586,18 +14233,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20615,17 +14255,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20640,17 +14273,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20665,16 +14291,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -20686,17 +14303,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20711,17 +14321,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20736,18 +14339,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20765,17 +14361,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20790,17 +14379,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20815,15 +14397,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -20853,17 +14427,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20878,17 +14445,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20903,17 +14463,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20928,17 +14481,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20953,18 +14499,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20982,17 +14521,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21007,17 +14539,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21032,18 +14557,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21061,18 +14579,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21090,17 +14601,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21115,17 +14619,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21140,17 +14637,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21165,17 +14655,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21190,18 +14673,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21219,17 +14695,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21244,15 +14713,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="step"
-                _key="steps"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps"
-                name="step"
-                _using-name="step"
-                _in-xml-name="step"
-                _in-json-name="steps"
-                gi="step">
+      <assembly name="step" gi="step">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -21285,17 +14746,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21310,18 +14764,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21339,17 +14786,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21364,18 +14804,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21393,17 +14826,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21418,15 +14844,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -21464,18 +14882,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21493,17 +14904,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21519,15 +14923,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -21538,18 +14935,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -21564,16 +14950,9 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -21585,18 +14964,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -21611,16 +14979,9 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -21632,15 +14993,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -21678,18 +15031,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21707,17 +15053,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21733,15 +15072,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -21752,17 +15084,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21777,18 +15102,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21806,17 +15124,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21831,15 +15142,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -21877,18 +15180,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21906,17 +15202,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21932,15 +15221,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -21951,18 +15233,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -21977,16 +15248,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -21998,18 +15262,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -22024,16 +15277,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -22045,15 +15291,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -22091,18 +15329,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22120,17 +15351,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22146,15 +15370,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -22165,17 +15382,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22190,15 +15400,8 @@
                  priority="3"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="terms-and-conditions"
-                _key="terms-and-conditions"
-                _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions"
-                name="terms-and-conditions"
+      <assembly name="terms-and-conditions"
                 key="terms-and-conditions"
-                _using-name="terms-and-conditions"
-                _in-xml-name="terms-and-conditions"
-                _in-json-name="terms-and-conditions"
                 gi="terms-and-conditions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">terms-and-conditions</xsl:attribute>
@@ -22216,17 +15419,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22241,17 +15437,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22266,18 +15455,11 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22295,17 +15477,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22320,15 +15495,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -22366,18 +15533,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22395,17 +15555,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22421,15 +15574,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -22440,18 +15586,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -22466,16 +15601,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -22487,18 +15615,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -22513,16 +15630,9 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -22534,15 +15644,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -22580,18 +15682,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22609,17 +15704,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22635,15 +15723,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -22654,18 +15735,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22683,17 +15757,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22709,15 +15776,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -22728,17 +15788,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22753,17 +15806,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22778,17 +15824,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22803,18 +15842,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22832,17 +15864,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22857,17 +15882,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22882,16 +15900,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -22903,17 +15912,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22928,17 +15930,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22953,15 +15948,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="assessment-platform"
-                _key="assessment-platforms"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms"
-                name="assessment-platform"
-                _using-name="assessment-platform"
-                _in-xml-name="assessment-platform"
-                _in-json-name="assessment-platforms"
-                gi="assessment-platform">
+      <assembly name="assessment-platform" gi="assessment-platform">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -22992,17 +15979,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23017,17 +15997,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23042,15 +16015,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="uses-component"
-                _key="uses-components"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components"
-                name="uses-component"
-                _using-name="uses-component"
-                _in-xml-name="uses-component"
-                _in-json-name="uses-components"
-                gi="uses-component">
+      <assembly name="uses-component" gi="uses-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -23080,17 +16045,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23105,17 +16063,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23130,17 +16081,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23155,18 +16099,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23184,17 +16121,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23209,16 +16139,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -23231,17 +16152,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -23253,15 +16164,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -23275,15 +16179,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -23296,15 +16193,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -23313,15 +16202,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -23358,17 +16239,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23383,17 +16257,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23408,18 +16275,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23437,17 +16297,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23463,15 +16316,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -23482,17 +16328,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23507,17 +16346,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23532,18 +16364,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23561,17 +16386,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23587,15 +16405,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -23606,17 +16417,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23631,17 +16435,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23656,17 +16453,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23681,15 +16471,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -23723,17 +16505,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23748,18 +16523,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23777,19 +16545,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -23801,16 +16559,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -23835,17 +16584,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23860,17 +16602,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23885,15 +16620,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -23909,17 +16636,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -23935,17 +16655,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23960,20 +16673,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23988,20 +16691,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24016,20 +16709,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24044,20 +16727,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24072,18 +16745,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -24114,10 +16776,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -24128,17 +16787,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24153,20 +16805,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24181,20 +16823,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24209,20 +16841,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24237,20 +16859,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24265,17 +16877,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24290,19 +16895,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -24314,17 +16909,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24339,17 +16927,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24364,17 +16945,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24389,18 +16963,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24418,17 +16985,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24443,17 +17003,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24468,19 +17021,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -24502,19 +17043,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -24526,17 +17057,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24551,17 +17075,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24576,17 +17093,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24601,17 +17111,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24626,19 +17129,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -24650,19 +17143,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -24674,16 +17157,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -24695,17 +17171,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24720,17 +17189,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24745,17 +17207,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24770,16 +17225,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -24791,17 +17239,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24816,19 +17257,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -24840,19 +17271,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -24864,18 +17285,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -24894,19 +17304,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -24918,17 +17318,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24943,17 +17336,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24968,17 +17354,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24993,17 +17372,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25018,16 +17390,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -25039,17 +17404,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25064,15 +17422,8 @@
                  priority="3"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ar/assessment-results/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ar/assessment-results/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -25098,18 +17449,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25127,17 +17471,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25152,17 +17489,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25177,17 +17507,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25202,17 +17525,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25227,18 +17543,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25256,17 +17565,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25281,15 +17583,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="step"
-                _key="steps"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps"
-                name="step"
-                _using-name="step"
-                _in-xml-name="step"
-                _in-json-name="steps"
-                gi="step">
+      <assembly name="step" gi="step">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -25322,17 +17616,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25347,18 +17634,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25376,17 +17656,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25401,18 +17674,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25430,17 +17696,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25455,15 +17714,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -25501,18 +17752,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25530,17 +17774,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25556,15 +17793,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -25575,18 +17805,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -25601,16 +17820,9 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -25622,18 +17834,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -25648,16 +17849,9 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -25669,15 +17863,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -25715,18 +17901,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25744,17 +17923,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25770,15 +17942,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -25789,17 +17954,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25814,18 +17972,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25843,17 +17994,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25868,15 +18012,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -25914,18 +18050,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25943,17 +18072,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25969,15 +18091,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -25988,18 +18103,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -26014,16 +18118,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -26035,18 +18132,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -26061,16 +18147,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -26082,15 +18161,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -26128,18 +18199,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26157,17 +18221,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26183,15 +18240,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -26202,17 +18252,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26227,17 +18270,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/result/title"
-             _metaschema-json-id="/assembly/oscal-ar/result/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26252,18 +18288,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/result/description"
-             _metaschema-json-id="/assembly/oscal-ar/result/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26281,17 +18310,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-ar/result/start"
-             _metaschema-json-id="/assembly/oscal-ar/result/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26306,17 +18328,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-ar/result/end"
-             _metaschema-json-id="/assembly/oscal-ar/result/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26331,17 +18346,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26356,15 +18364,8 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ar/result/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -26404,17 +18405,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26429,18 +18423,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26458,17 +18445,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26483,17 +18463,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26508,16 +18481,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -26529,17 +18493,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26554,17 +18511,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26579,18 +18529,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26608,17 +18551,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26633,17 +18569,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26658,15 +18587,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -26696,17 +18617,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26721,17 +18635,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26746,17 +18653,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26771,17 +18671,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26796,18 +18689,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26825,17 +18711,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26850,17 +18729,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26875,18 +18747,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26904,17 +18769,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26929,18 +18787,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26958,17 +18809,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26983,17 +18827,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27008,16 +18845,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -27029,17 +18857,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27054,17 +18875,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27079,15 +18893,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="assessment-platform"
-                _key="assessment-platforms"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms"
-                name="assessment-platform"
-                _using-name="assessment-platform"
-                _in-xml-name="assessment-platform"
-                _in-json-name="assessment-platforms"
-                gi="assessment-platform">
+      <assembly name="assessment-platform" gi="assessment-platform">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -27118,17 +18924,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27143,17 +18942,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27168,15 +18960,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="uses-component"
-                _key="uses-components"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components"
-                name="uses-component"
-                _using-name="uses-component"
-                _in-xml-name="uses-component"
-                _in-json-name="uses-components"
-                gi="uses-component">
+      <assembly name="uses-component" gi="uses-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -27206,17 +18990,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27231,17 +19008,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27256,17 +19026,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27281,18 +19044,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27310,17 +19066,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27335,16 +19084,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -27357,17 +19097,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -27379,15 +19109,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -27401,15 +19124,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -27422,15 +19138,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -27439,15 +19147,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -27484,17 +19184,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27509,17 +19202,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27534,18 +19220,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27563,17 +19242,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27589,15 +19261,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -27608,17 +19273,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27633,17 +19291,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27658,18 +19309,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27687,17 +19331,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27713,15 +19350,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -27732,17 +19362,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27757,17 +19380,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27782,17 +19398,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27807,18 +19416,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27836,17 +19438,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27861,15 +19456,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -27907,18 +19494,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27936,17 +19516,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27962,15 +19535,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -27981,18 +19547,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -28007,16 +19562,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -28028,18 +19576,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="statement-id" group-by="true()">
             <group in-json="ARRAY" key="statement-ids">
@@ -28054,16 +19591,9 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -28075,15 +19605,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -28121,18 +19643,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28150,17 +19665,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28176,15 +19684,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -28195,15 +19696,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="attestation"
-                _key="attestations"
-                _metaschema-xml-id="/assembly/oscal-ar/result/attestation"
-                _metaschema-json-id="/assembly/oscal-ar/result/attestations"
-                name="attestation"
-                _using-name="attestation"
-                _in-xml-name="attestation"
-                _in-json-name="attestations"
-                gi="attestation">
+      <assembly name="attestation" gi="attestation">
          <xsl:for-each-group select="responsible-party" group-by="true()">
             <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
@@ -28224,17 +19717,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28249,17 +19735,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28274,17 +19753,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28299,16 +19771,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="assessment-log"
-                _key="assessment-log"
-                _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log"
-                _metaschema-json-id="/assembly/oscal-ar/result/assessment-log"
-                name="assessment-log"
-                key="assessment-log"
-                _using-name="assessment-log"
-                _in-xml-name="assessment-log"
-                _in-json-name="assessment-log"
-                gi="assessment-log">
+      <assembly name="assessment-log" key="assessment-log" gi="assessment-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-log</xsl:attribute>
          </xsl:if>
@@ -28325,15 +19788,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry"
-                _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -28374,17 +19829,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28399,18 +19847,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28428,17 +19869,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28453,17 +19887,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28478,17 +19905,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28503,17 +19923,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28528,17 +19941,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28553,18 +19959,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28582,17 +19981,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28608,15 +20000,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -28627,17 +20012,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28652,17 +20030,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28677,15 +20048,8 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -28704,18 +20068,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28733,17 +20090,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28759,15 +20109,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -28778,17 +20121,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28803,17 +20139,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28828,17 +20157,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28853,18 +20175,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28882,17 +20197,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28907,16 +20215,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="method"
-             _key="methods"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/method"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/methods"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="method"
-             _using-name="method"
-             _in-xml-name="method"
-             _in-json-name="methods"
              gi="method"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -28928,16 +20229,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="type"
-             _key="types"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/type"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/types"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="type"
-             _using-name="type"
-             _in-xml-name="type"
-             _in-json-name="types"
              gi="type"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -28949,17 +20243,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28974,17 +20261,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28999,17 +20279,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29024,18 +20297,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29053,17 +20319,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29079,15 +20338,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -29098,17 +20350,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29123,17 +20368,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29148,15 +20386,8 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -29175,18 +20406,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29204,17 +20428,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29230,15 +20447,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -29249,17 +20459,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29274,17 +20477,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29299,18 +20495,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -29335,17 +20520,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29360,17 +20538,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29385,15 +20556,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="relevant-evidence"
-                _key="relevant-evidence"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                name="relevant-evidence"
-                _using-name="relevant-evidence"
-                _in-xml-name="relevant-evidence"
-                _in-json-name="relevant-evidence"
-                gi="relevant-evidence">
+      <assembly name="relevant-evidence" gi="relevant-evidence">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -29417,18 +20580,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29446,17 +20602,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29471,17 +20620,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="collected"
-             _key="collected"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/collected"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/collected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="collected"
              key="collected"
-             _using-name="collected"
-             _in-xml-name="collected"
-             _in-json-name="collected"
              gi="collected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29496,17 +20638,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expires"
-             _key="expires"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/expires"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/expires"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="expires"
              key="expires"
-             _using-name="expires"
-             _in-xml-name="expires"
-             _in-json-name="expires"
              gi="expires"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29521,17 +20656,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29546,18 +20674,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29575,18 +20696,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement"
-             _key="statement"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/statement"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/statement"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="statement"
              key="statement"
-             _using-name="statement"
-             _in-xml-name="statement"
-             _in-json-name="statement"
              gi="statement"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29604,17 +20718,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29629,17 +20736,10 @@
                  priority="7"
                  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/risk/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/status"
-             collapsible="no"
+      <field 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">
          <xsl:if test="$with-key">
@@ -29654,17 +20754,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29679,17 +20772,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29704,17 +20790,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29729,18 +20808,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29758,17 +20830,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29784,15 +20849,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -29803,17 +20861,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29828,17 +20879,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29853,15 +20897,8 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -29880,18 +20917,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29909,17 +20939,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29935,15 +20958,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -29954,17 +20970,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29979,17 +20988,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30004,17 +21006,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30029,17 +21024,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30054,17 +21042,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30079,17 +21060,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30104,18 +21078,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30133,17 +21100,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30159,15 +21119,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -30178,17 +21131,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30203,17 +21149,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30228,15 +21167,8 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -30255,18 +21187,11 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30284,17 +21209,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30310,15 +21228,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -30329,17 +21240,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30354,17 +21258,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30379,15 +21276,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="facet"
-                _key="facets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet"
-                _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets"
-                name="facet"
-                _using-name="facet"
-                _in-xml-name="facet"
-                _in-json-name="facets"
-                gi="facet">
+      <assembly name="facet" gi="facet">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@system"/>
          <xsl:apply-templates select="@value"/>
@@ -30412,17 +21301,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30437,15 +21319,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="mitigating-factor"
-                _key="mitigating-factors"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors"
-                name="mitigating-factor"
-                _using-name="mitigating-factor"
-                _in-xml-name="mitigating-factor"
-                _in-json-name="mitigating-factors"
-                gi="mitigating-factor">
+      <assembly name="mitigating-factor" gi="mitigating-factor">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@implementation-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -30476,18 +21350,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30505,17 +21372,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30530,18 +21390,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -30566,17 +21415,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30591,17 +21433,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30616,17 +21451,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="deadline"
-             _key="deadline"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/deadline"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/deadline"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="deadline"
              key="deadline"
-             _using-name="deadline"
-             _in-xml-name="deadline"
-             _in-json-name="deadline"
              gi="deadline"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30641,18 +21469,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:response"
-                _step="response"
-                _key="remediations"
-                _key-ref="oscal-assessment-common:response"
-                _using-name="response"
-                _in-xml-name="response"
-                _in-json-name="remediations"
-                gi="response">
+      <assembly name="response" gi="response">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@lifecycle"/>
          <xsl:apply-templates select="title"/>
@@ -30699,17 +21516,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30724,18 +21534,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30753,17 +21556,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30778,17 +21574,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30803,17 +21592,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30828,17 +21610,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30853,18 +21628,11 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30882,17 +21650,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30908,15 +21669,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -30927,17 +21681,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30952,17 +21699,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30977,15 +21717,8 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -31004,18 +21737,11 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31033,17 +21759,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31059,15 +21778,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -31078,17 +21790,10 @@
                  priority="21"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31103,17 +21808,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31128,15 +21826,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="required-asset"
-                _key="required-assets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset"
-                _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets"
-                name="required-asset"
-                _using-name="required-asset"
-                _in-xml-name="required-asset"
-                _in-json-name="required-assets"
-                gi="required-asset">
+      <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="@uuid"/>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
@@ -31168,18 +21858,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -31204,17 +21883,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31229,17 +21901,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31254,17 +21919,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31279,18 +21937,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31308,17 +21959,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31333,17 +21977,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31358,18 +21995,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31387,17 +22017,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31412,16 +22035,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -31434,17 +22048,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -31456,15 +22060,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -31478,15 +22075,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -31499,15 +22089,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -31516,15 +22098,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -31561,17 +22135,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31586,17 +22153,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31611,18 +22171,11 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31640,17 +22193,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31666,15 +22212,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -31685,17 +22224,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31710,17 +22242,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31735,18 +22260,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31764,17 +22282,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31790,15 +22301,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -31809,17 +22313,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31834,17 +22331,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31859,17 +22349,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31884,16 +22367,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="risk-log"
-                _key="risk-log"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log"
-                name="risk-log"
-                key="risk-log"
-                _using-name="risk-log"
-                _in-xml-name="risk-log"
-                _in-json-name="risk-log"
-                gi="risk-log">
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">risk-log</xsl:attribute>
          </xsl:if>
@@ -31910,15 +22384,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -31960,17 +22426,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31985,18 +22444,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32014,17 +22466,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32039,17 +22484,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32064,17 +22502,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32089,15 +22520,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="related-response"
-                _key="related-responses"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses"
-                name="related-response"
-                _using-name="related-response"
-                _in-xml-name="related-response"
-                _in-json-name="related-responses"
-                gi="related-response">
+      <assembly name="related-response" gi="related-response">
          <xsl:apply-templates select="@response-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -32127,17 +22550,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32152,17 +22568,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32177,17 +22586,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32202,18 +22604,11 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32231,17 +22626,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32257,15 +22645,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -32276,17 +22657,10 @@
                  priority="21"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32301,17 +22675,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32326,15 +22693,8 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -32353,18 +22713,11 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32382,17 +22735,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32408,15 +22754,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -32427,17 +22766,10 @@
                  priority="22"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32452,17 +22784,10 @@
                  priority="21"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32477,16 +22802,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
@@ -32494,17 +22810,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/title"
-             _metaschema-json-id="/assembly/oscal-ar/finding/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32519,18 +22828,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/description"
-             _metaschema-json-id="/assembly/oscal-ar/finding/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32548,17 +22850,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32573,17 +22868,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32598,17 +22886,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32623,17 +22904,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32648,18 +22922,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32677,17 +22944,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32703,15 +22963,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -32722,17 +22975,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32747,17 +22993,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32772,15 +23011,8 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -32799,18 +23031,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32828,17 +23053,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32854,15 +23072,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -32873,17 +23084,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32898,17 +23102,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32923,17 +23120,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32948,18 +23138,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32977,17 +23160,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33002,16 +23178,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -33024,17 +23191,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="implementation-statement-uuid"
-             _key="implementation-statement-uuid"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/implementation-statement-uuid"
-             _metaschema-json-id="/assembly/oscal-ar/finding/implementation-statement-uuid"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="implementation-statement-uuid"
              key="implementation-statement-uuid"
-             _using-name="implementation-statement-uuid"
-             _in-xml-name="implementation-statement-uuid"
-             _in-json-name="implementation-statement-uuid"
              gi="implementation-statement-uuid"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33049,16 +23209,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-ar/finding/related-observation"
-                _metaschema-json-id="/assembly/oscal-ar/finding/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
@@ -33066,16 +23217,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="associated-risk"
-                _key="related-risks"
-                _metaschema-xml-id="/assembly/oscal-ar/finding/associated-risk"
-                _metaschema-json-id="/assembly/oscal-ar/finding/related-risks"
-                name="associated-risk"
-                _using-name="associated-risk"
-                _in-xml-name="associated-risk"
-                _in-json-name="related-risks"
-                gi="associated-risk">
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="@risk-uuid"/>
       </assembly>
    </xsl:template>
@@ -33083,15 +23225,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -33125,17 +23259,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33150,18 +23277,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33179,19 +23299,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -33203,16 +23313,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -33237,17 +23338,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33262,17 +23356,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33287,15 +23374,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -33311,17 +23390,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -33337,17 +23409,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33362,20 +23427,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33390,20 +23445,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33418,20 +23463,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33446,20 +23481,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33474,18 +23499,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -33516,10 +23530,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -33530,17 +23541,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33555,20 +23559,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33583,20 +23577,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33611,20 +23595,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33639,20 +23613,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33667,17 +23631,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33692,19 +23649,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -33716,17 +23663,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33741,17 +23681,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33766,17 +23699,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33791,18 +23717,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33820,17 +23739,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33845,17 +23757,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33870,19 +23775,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -33904,19 +23797,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -33928,17 +23811,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33953,17 +23829,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33978,17 +23847,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34003,17 +23865,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34028,19 +23883,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -34052,19 +23897,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -34076,16 +23911,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -34097,17 +23925,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34122,17 +23943,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34147,17 +23961,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34172,16 +23979,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -34193,17 +23993,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34218,19 +24011,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -34242,19 +24025,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -34266,18 +24039,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -34296,19 +24058,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -34320,17 +24072,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34345,17 +24090,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34370,17 +24108,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34395,17 +24126,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34420,16 +24144,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -34441,17 +24158,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34466,17 +24176,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34491,18 +24194,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34520,17 +24216,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34545,17 +24234,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34570,16 +24252,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -34591,17 +24264,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34616,17 +24282,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34641,18 +24300,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34670,17 +24322,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34695,17 +24340,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34720,15 +24358,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -34758,17 +24388,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34783,17 +24406,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34808,17 +24424,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34833,18 +24442,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34862,17 +24464,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34887,16 +24482,9 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="method"
-             _key="methods"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/method"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/methods"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="method"
-             _using-name="method"
-             _in-xml-name="method"
-             _in-json-name="methods"
              gi="method"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -34908,16 +24496,9 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="type"
-             _key="types"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/type"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/types"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="type"
-             _using-name="type"
-             _in-xml-name="type"
-             _in-json-name="types"
              gi="type"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -34929,17 +24510,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34954,17 +24528,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34979,17 +24546,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35004,18 +24564,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35033,17 +24586,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35059,15 +24605,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -35078,17 +24617,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35103,17 +24635,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35128,15 +24653,8 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -35155,18 +24673,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35184,17 +24695,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35210,15 +24714,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -35229,17 +24726,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35254,17 +24744,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35279,18 +24762,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -35315,17 +24787,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35340,17 +24805,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35365,15 +24823,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="relevant-evidence"
-                _key="relevant-evidence"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                name="relevant-evidence"
-                _using-name="relevant-evidence"
-                _in-xml-name="relevant-evidence"
-                _in-json-name="relevant-evidence"
-                gi="relevant-evidence">
+      <assembly name="relevant-evidence" gi="relevant-evidence">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -35397,18 +24847,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35426,17 +24869,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35451,17 +24887,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="collected"
-             _key="collected"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/collected"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/collected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="collected"
              key="collected"
-             _using-name="collected"
-             _in-xml-name="collected"
-             _in-json-name="collected"
              gi="collected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35476,17 +24905,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expires"
-             _key="expires"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/expires"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/expires"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="expires"
              key="expires"
-             _using-name="expires"
-             _in-xml-name="expires"
-             _in-json-name="expires"
              gi="expires"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35501,17 +24923,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35526,18 +24941,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35555,18 +24963,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement"
-             _key="statement"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/statement"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/statement"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="statement"
              key="statement"
-             _using-name="statement"
-             _in-xml-name="statement"
-             _in-json-name="statement"
              gi="statement"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35584,17 +24985,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35609,17 +25003,10 @@
                  priority="5"
                  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/risk/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/status"
-             collapsible="no"
+      <field 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">
          <xsl:if test="$with-key">
@@ -35634,17 +25021,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35659,17 +25039,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35684,17 +25057,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35709,18 +25075,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35738,17 +25097,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35764,15 +25116,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -35783,17 +25128,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35808,17 +25146,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35833,15 +25164,8 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -35860,18 +25184,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35889,17 +25206,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35915,15 +25225,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -35934,17 +25237,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35959,17 +25255,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35984,17 +25273,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36009,17 +25291,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36034,17 +25309,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36059,17 +25327,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36084,18 +25345,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36113,17 +25367,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36139,15 +25386,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -36158,17 +25398,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36183,17 +25416,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36208,15 +25434,8 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -36235,18 +25454,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36264,17 +25476,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36290,15 +25495,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -36309,17 +25507,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36334,17 +25525,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36359,15 +25543,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="facet"
-                _key="facets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet"
-                _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets"
-                name="facet"
-                _using-name="facet"
-                _in-xml-name="facet"
-                _in-json-name="facets"
-                gi="facet">
+      <assembly name="facet" gi="facet">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@system"/>
          <xsl:apply-templates select="@value"/>
@@ -36392,17 +25568,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36417,15 +25586,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="mitigating-factor"
-                _key="mitigating-factors"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors"
-                name="mitigating-factor"
-                _using-name="mitigating-factor"
-                _in-xml-name="mitigating-factor"
-                _in-json-name="mitigating-factors"
-                gi="mitigating-factor">
+      <assembly name="mitigating-factor" gi="mitigating-factor">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@implementation-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -36456,18 +25617,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36485,17 +25639,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36510,18 +25657,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -36546,17 +25682,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36571,17 +25700,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36596,17 +25718,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="deadline"
-             _key="deadline"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/deadline"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/deadline"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="deadline"
              key="deadline"
-             _using-name="deadline"
-             _in-xml-name="deadline"
-             _in-json-name="deadline"
              gi="deadline"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36621,18 +25736,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:response"
-                _step="response"
-                _key="remediations"
-                _key-ref="oscal-assessment-common:response"
-                _using-name="response"
-                _in-xml-name="response"
-                _in-json-name="remediations"
-                gi="response">
+      <assembly name="response" gi="response">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@lifecycle"/>
          <xsl:apply-templates select="title"/>
@@ -36679,17 +25783,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36704,18 +25801,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36733,17 +25823,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36758,17 +25841,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36783,17 +25859,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36808,17 +25877,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36833,18 +25895,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36862,17 +25917,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36888,15 +25936,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -36907,17 +25948,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36932,17 +25966,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36957,15 +25984,8 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -36984,18 +26004,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37013,17 +26026,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37039,15 +26045,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -37058,17 +26057,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37083,17 +26075,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37108,15 +26093,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="required-asset"
-                _key="required-assets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset"
-                _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets"
-                name="required-asset"
-                _using-name="required-asset"
-                _in-xml-name="required-asset"
-                _in-json-name="required-assets"
-                gi="required-asset">
+      <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="@uuid"/>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
@@ -37148,18 +26125,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -37184,17 +26150,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37209,17 +26168,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37234,17 +26186,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37259,18 +26204,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37288,17 +26226,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37313,17 +26244,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37338,18 +26262,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37367,17 +26284,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37392,16 +26302,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -37414,17 +26315,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -37436,15 +26327,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -37458,15 +26342,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -37479,15 +26356,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -37496,15 +26365,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -37541,17 +26402,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37566,17 +26420,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37591,18 +26438,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37620,17 +26460,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37646,15 +26479,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -37665,17 +26491,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37690,17 +26509,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37715,18 +26527,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37744,17 +26549,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37770,15 +26568,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -37789,17 +26580,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37814,17 +26598,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37839,17 +26616,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37864,16 +26634,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="risk-log"
-                _key="risk-log"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log"
-                name="risk-log"
-                key="risk-log"
-                _using-name="risk-log"
-                _in-xml-name="risk-log"
-                _in-json-name="risk-log"
-                gi="risk-log">
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">risk-log</xsl:attribute>
          </xsl:if>
@@ -37890,15 +26651,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -37940,17 +26693,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37965,18 +26711,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37994,17 +26733,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38019,17 +26751,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38044,17 +26769,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38069,15 +26787,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="related-response"
-                _key="related-responses"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses"
-                name="related-response"
-                _using-name="related-response"
-                _in-xml-name="related-response"
-                _in-json-name="related-responses"
-                gi="related-response">
+      <assembly name="related-response" gi="related-response">
          <xsl:apply-templates select="@response-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -38107,17 +26817,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38132,17 +26835,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38157,17 +26853,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38182,18 +26871,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38211,17 +26893,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38237,15 +26912,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -38256,17 +26924,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38281,17 +26942,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38306,15 +26960,8 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -38333,18 +26980,11 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38362,17 +27002,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38388,15 +27021,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -38407,17 +27033,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38432,17 +27051,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38457,16 +27069,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
@@ -38474,17 +27077,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-poam/poam-item/title"
-             _metaschema-json-id="/assembly/oscal-poam/poam-item/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38499,18 +27095,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-poam/poam-item/description"
-             _metaschema-json-id="/assembly/oscal-poam/poam-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38528,17 +27117,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38553,15 +27135,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="origin"
-                _key="origins"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/origin"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/origins"
-                name="origin"
-                _using-name="origin"
-                _in-xml-name="origin"
-                _in-json-name="origins"
-                gi="origin">
+      <assembly name="origin" gi="origin">
          <xsl:for-each-group select="actor" group-by="true()">
             <group in-json="ARRAY" key="actors">
                <xsl:apply-templates select="current-group()">
@@ -38575,17 +27149,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38600,16 +27167,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/related-observation"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
@@ -38617,16 +27175,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="associated-risk"
-                _key="related-risks"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/associated-risk"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/related-risks"
-                name="associated-risk"
-                _using-name="associated-risk"
-                _in-xml-name="associated-risk"
-                _in-json-name="related-risks"
-                gi="associated-risk">
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="@risk-uuid"/>
       </assembly>
    </xsl:template>
@@ -38634,15 +27183,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -38676,17 +27217,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38701,18 +27235,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38730,19 +27257,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -38754,16 +27271,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -38788,17 +27296,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38813,17 +27314,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38838,15 +27332,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -38862,17 +27348,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
diff --git a/json/convert/oscal_component_xml-to-json-converter.xsl b/json/convert/oscal_component_xml-to-json-converter.xsl
index 50824aef71..d6fa1cee63 100644
--- a/json/convert/oscal_component_xml-to-json-converter.xsl
+++ b/json/convert/oscal_component_xml-to-json-converter.xsl
@@ -83,13 +83,8 @@
    <xsl:template match="component-definition"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition"
-                _metaschema-json-id="/assembly/oscal-component-definition/component-definition"
-                name="component-definition"
+      <assembly name="component-definition"
                 key="component-definition"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">component-definition</xsl:attribute>
@@ -126,19 +121,7 @@
    <xsl:template match="metadata"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -203,18 +186,7 @@
    <xsl:template match="prop"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@ns"/>
@@ -226,18 +198,7 @@
    <xsl:template match="link"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
@@ -247,18 +208,7 @@
    <xsl:template match="role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -283,18 +233,7 @@
    <xsl:template match="location"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="address"/>
@@ -339,18 +278,7 @@
    <xsl:template match="party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="name"/>
@@ -417,18 +345,7 @@
    <xsl:template match="responsible-party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="party-uuid" group-by="true()">
             <group in-json="ARRAY" key="party-uuids">
@@ -458,17 +375,7 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:import-component-definition"
-                _step="import-component-definition"
-                _key="import-component-definitions"
-                _key-ref="oscal-component-definition:import-component-definition"
-                _using-name="import-component-definition"
-                _in-xml-name="import-component-definition"
-                _in-json-name="import-component-definitions"
                 gi="import-component-definition">
          <xsl:apply-templates select="@href"/>
       </assembly>
@@ -476,18 +383,7 @@
    <xsl:template match="component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:defined-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-component-definition:defined-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="defined-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -534,18 +430,7 @@
    <xsl:template match="responsible-role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -574,18 +459,7 @@
    <xsl:template match="protocol"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="title"/>
@@ -601,19 +475,7 @@
    <xsl:template match="port-range"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
          <xsl:apply-templates select="@end"/>
          <xsl:apply-templates select="@transport"/>
@@ -622,18 +484,7 @@
    <xsl:template match="set-parameter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:set-parameter"
-                _step="set-parameter"
-                _key="set-parameters"
-                _key-ref="oscal-implementation-common:set-parameter"
-                _using-name="set-parameter"
-                _in-xml-name="set-parameter"
-                _in-json-name="set-parameters"
-                gi="set-parameter">
+      <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="@param-id"/>
          <xsl:for-each-group select="value" group-by="true()">
             <group in-json="ARRAY" key="values">
@@ -648,18 +499,7 @@
    <xsl:template match="capability"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:capability"
-                _step="capability"
-                _key="capabilities"
-                _key-ref="oscal-component-definition:capability"
-                _using-name="capability"
-                _in-xml-name="capability"
-                _in-json-name="capabilities"
-                gi="capability">
+      <assembly name="capability" gi="capability">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="description"/>
@@ -697,18 +537,7 @@
    <xsl:template match="incorporates-component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:incorporates-component"
-                _step="incorporates-component"
-                _key="incorporates-components"
-                _key-ref="oscal-component-definition:incorporates-component"
-                _using-name="incorporates-component"
-                _in-xml-name="incorporates-component"
-                _in-json-name="incorporates-components"
-                gi="incorporates-component">
+      <assembly name="incorporates-component" gi="incorporates-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:apply-templates select="description"/>
       </assembly>
@@ -716,19 +545,7 @@
    <xsl:template match="back-matter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -744,21 +561,11 @@
    <xsl:template match="remarks"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -775,19 +582,9 @@
    <xsl:template match="location-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -798,19 +595,9 @@
    <xsl:template match="party-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -821,20 +608,7 @@
    <xsl:template match="hash"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
          <value as-type="string" key="value" in-json="string">
             <xsl:value-of select="."/>
@@ -845,15 +619,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/component-definition/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -862,15 +629,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -879,33 +639,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -913,15 +655,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -930,15 +665,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -947,15 +675,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -964,15 +685,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -981,18 +695,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1002,33 +706,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="role/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1036,15 +722,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1053,18 +732,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1074,15 +743,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1091,15 +753,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1108,15 +763,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1126,15 +774,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1143,15 +784,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1160,15 +794,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-component-definition/import-component-definition/href"
-            _metaschema-json-id="/assembly/oscal-component-definition/import-component-definition/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1177,15 +804,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/defined-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1194,18 +814,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/type"
-            _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/src/metaschema/oscal_component_metaschema.xml"
-            _key-name="oscal-component-definition:defined-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-component-definition:defined-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1214,15 +824,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1231,15 +834,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1248,15 +844,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1265,15 +854,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -1282,15 +864,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -1299,15 +874,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -1317,15 +885,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1334,18 +895,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/source"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:source"
-            _step="source"
-            _key="source"
-            _key-ref="oscal-implementation-common:source"
-            _using-name="source"
-            _in-xml-name="source"
-            _in-json-name="source"
             gi="source">
          <xsl:value-of select="."/>
       </flag>
@@ -1354,18 +905,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/param-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:param-id"
-            _step="param-id"
-            _key="param-id"
-            _key-ref="oscal-implementation-common:param-id"
-            _using-name="param-id"
-            _in-xml-name="param-id"
-            _in-json-name="param-id"
             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1375,15 +916,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1392,18 +926,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1412,18 +936,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-component-definition/statement/statement-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:statement-id"
-            _step="statement-id"
-            _key="statement-id"
-            _key-ref="oscal-implementation-common:statement-id"
-            _using-name="statement-id"
-            _in-xml-name="statement-id"
-            _in-json-name="statement-id"
             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1433,15 +947,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/statement/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/statement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1450,15 +957,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/capability/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/capability/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1467,15 +967,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-component-definition/capability/name"
-            _metaschema-json-id="/assembly/oscal-component-definition/capability/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1484,15 +977,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/incorporates-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/incorporates-component/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1502,15 +988,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1520,15 +999,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1537,18 +1009,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1557,15 +1019,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -1575,15 +1030,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -1592,18 +1040,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1612,17 +1050,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1637,20 +1068,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1665,20 +1086,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1693,20 +1104,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1721,20 +1122,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1749,18 +1140,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -1791,10 +1171,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1805,17 +1182,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1830,20 +1200,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1858,20 +1218,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1886,20 +1236,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1914,20 +1254,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1942,17 +1272,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1967,19 +1290,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -1991,17 +1304,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2016,17 +1322,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2041,17 +1340,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2066,18 +1358,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2095,17 +1380,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2120,17 +1398,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2145,19 +1416,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -2179,19 +1438,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -2203,17 +1452,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2228,17 +1470,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2253,17 +1488,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2278,17 +1506,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2303,19 +1524,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -2327,19 +1538,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -2351,16 +1552,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -2372,17 +1566,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2397,17 +1584,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2422,17 +1602,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2447,16 +1620,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -2468,17 +1634,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2493,19 +1652,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -2517,19 +1666,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -2541,18 +1680,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -2571,19 +1699,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -2595,17 +1713,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2620,17 +1731,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2645,17 +1749,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2670,17 +1767,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2695,16 +1785,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -2716,17 +1799,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2741,17 +1817,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/title"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2766,18 +1835,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2795,17 +1857,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/purpose"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2820,17 +1875,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2845,17 +1893,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2870,17 +1911,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2895,18 +1929,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:control-implementation"
-                _step="control-implementation"
-                _key="control-implementations"
-                _key-ref="oscal-component-definition:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementations"
-                gi="control-implementation">
+      <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@source"/>
          <xsl:apply-templates select="description"/>
@@ -2944,18 +1967,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2973,17 +1989,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2998,16 +2007,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3019,18 +2021,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-component-definition:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@control-id"/>
          <xsl:apply-templates select="description"/>
@@ -3076,18 +2067,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3105,17 +2089,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3130,16 +2107,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3151,17 +2121,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3176,18 +2139,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-component-definition:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
@@ -3219,18 +2171,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/statement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/statement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3248,17 +2193,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3273,17 +2211,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3298,18 +2229,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/capability/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/capability/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3327,17 +2251,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3352,18 +2269,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/incorporates-component/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/incorporates-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3381,18 +2291,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:control-implementation"
-                _step="control-implementation"
-                _key="control-implementations"
-                _key-ref="oscal-component-definition:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementations"
-                gi="control-implementation">
+      <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@source"/>
          <xsl:apply-templates select="description"/>
@@ -3430,18 +2329,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3459,17 +2351,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3484,16 +2369,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3505,18 +2383,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-component-definition:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@control-id"/>
          <xsl:apply-templates select="description"/>
@@ -3562,18 +2429,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3591,17 +2451,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3616,16 +2469,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3637,17 +2483,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3662,18 +2501,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-component-definition:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
@@ -3705,18 +2533,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/statement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/statement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3734,17 +2555,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3759,17 +2573,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3784,15 +2591,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -3826,17 +2625,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3851,18 +2643,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3880,19 +2665,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -3904,16 +2679,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -3938,17 +2704,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3963,17 +2722,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3988,15 +2740,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -4012,17 +2756,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
diff --git a/json/convert/oscal_poam_xml-to-json-converter.xsl b/json/convert/oscal_poam_xml-to-json-converter.xsl
index cbaec95838..caf1cffd36 100644
--- a/json/convert/oscal_poam_xml-to-json-converter.xsl
+++ b/json/convert/oscal_poam_xml-to-json-converter.xsl
@@ -83,13 +83,8 @@
    <xsl:template match="plan-of-action-and-milestones"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones"
-                _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones"
-                name="plan-of-action-and-milestones"
+      <assembly 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/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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">plan-of-action-and-milestones</xsl:attribute>
@@ -129,19 +124,7 @@
    <xsl:template match="metadata"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -206,18 +189,7 @@
    <xsl:template match="prop"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@ns"/>
@@ -229,18 +201,7 @@
    <xsl:template match="link"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
@@ -250,18 +211,7 @@
    <xsl:template match="role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -286,18 +236,7 @@
    <xsl:template match="location"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="address"/>
@@ -342,18 +281,7 @@
    <xsl:template match="party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="name"/>
@@ -420,18 +348,7 @@
    <xsl:template match="responsible-party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="party-uuid" group-by="true()">
             <group in-json="ARRAY" key="party-uuids">
@@ -460,19 +377,7 @@
    <xsl:template match="import-ssp"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/import-ssp"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:import-ssp"
-                _step="import-ssp"
-                _key="import-ssp"
-                _key-ref="oscal-assessment-common:import-ssp"
-                _using-name="import-ssp"
-                _in-xml-name="import-ssp"
-                _in-json-name="import-ssp"
-                gi="import-ssp">
+      <assembly name="import-ssp" key="import-ssp" gi="import-ssp">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-ssp</xsl:attribute>
          </xsl:if>
@@ -483,18 +388,8 @@
    <xsl:template match="local-definitions"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
-                _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _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"
-                _key-ref="oscal-poam:local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -519,18 +414,7 @@
    <xsl:template match="component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-implementation-common:system-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="system-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -571,18 +455,7 @@
    <xsl:template match="responsible-role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -611,18 +484,7 @@
    <xsl:template match="protocol"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="title"/>
@@ -638,19 +500,7 @@
    <xsl:template match="port-range"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
          <xsl:apply-templates select="@end"/>
          <xsl:apply-templates select="@transport"/>
@@ -659,18 +509,7 @@
    <xsl:template match="inventory-item"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:inventory-item"
-                _step="inventory-item"
-                _key="inventory-items"
-                _key-ref="oscal-implementation-common:inventory-item"
-                _using-name="inventory-item"
-                _in-xml-name="inventory-item"
-                _in-json-name="inventory-items"
-                gi="inventory-item">
+      <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -707,18 +546,7 @@
    <xsl:template match="observation"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:observation"
-                _step="observation"
-                _key="observations"
-                _key-ref="oscal-assessment-common:observation"
-                _using-name="observation"
-                _in-xml-name="observation"
-                _in-json-name="observations"
-                gi="observation">
+      <assembly name="observation" gi="observation">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -779,18 +607,7 @@
    <xsl:template match="origin"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin"
-                _step="origin"
-                _key="origins"
-                _key-ref="oscal-assessment-common:origin"
-                _using-name="origin"
-                _in-xml-name="origin"
-                _in-json-name="origins"
-                gi="origin">
+      <assembly name="origin" gi="origin">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">origin</xsl:attribute>
          </xsl:if>
@@ -813,18 +630,7 @@
    <xsl:template match="actor"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin-actor"
-                _step="actor"
-                _key="actors"
-                _key-ref="oscal-assessment-common:origin-actor"
-                _using-name="actor"
-                _in-xml-name="actor"
-                _in-json-name="actors"
-                gi="actor">
+      <assembly name="origin-actor" gi="actor">
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="@actor-uuid"/>
          <xsl:apply-templates select="@role-id"/>
@@ -847,18 +653,7 @@
    <xsl:template match="related-task"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:related-task"
-                _step="related-task"
-                _key="related-tasks"
-                _key-ref="oscal-assessment-common:related-task"
-                _using-name="related-task"
-                _in-xml-name="related-task"
-                _in-json-name="related-tasks"
-                gi="related-task">
+      <assembly name="related-task" gi="related-task">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -895,18 +690,7 @@
    <xsl:template match="subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -944,18 +728,7 @@
    <xsl:template match="include-subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="include-subject"
-                _key="include-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="include-subject"
-                _in-xml-name="include-subject"
-                _in-json-name="include-subjects"
-                gi="include-subject">
+      <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -978,18 +751,7 @@
    <xsl:template match="exclude-subject"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="exclude-subject"
-                _key="exclude-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="exclude-subject"
-                _in-xml-name="exclude-subject"
-                _in-json-name="exclude-subjects"
-                gi="exclude-subject">
+      <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1012,18 +774,7 @@
    <xsl:template match="risk"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:risk"
-                _step="risk"
-                _key="risks"
-                _key-ref="oscal-assessment-common:risk"
-                _using-name="risk"
-                _in-xml-name="risk"
-                _in-json-name="risks"
-                gi="risk">
+      <assembly name="risk" gi="risk">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -1092,18 +843,7 @@
    <xsl:template match="characterization"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:characterization"
-                _step="characterization"
-                _key="characterizations"
-                _key-ref="oscal-assessment-common:characterization"
-                _using-name="characterization"
-                _in-xml-name="characterization"
-                _in-json-name="characterizations"
-                gi="characterization">
+      <assembly name="characterization" gi="characterization">
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -1131,18 +871,7 @@
    <xsl:template match="task"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="task"
-                _in-xml-name="task"
-                _in-json-name="tasks"
-                gi="task">
+      <assembly name="task" gi="task">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -1203,19 +932,7 @@
    <xsl:template match="logged-by"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:logged-by"
-                _step="logged-by"
-                _key="logged-by"
-                _key-ref="oscal-assessment-common:logged-by"
-                _using-name="logged-by"
-                _in-xml-name="logged-by"
-                _in-json-name="logged-by"
-                gi="logged-by">
+      <assembly as-type="empty" name="logged-by" gi="logged-by">
          <xsl:apply-templates select="@party-uuid"/>
          <xsl:apply-templates select="@role-id"/>
       </assembly>
@@ -1223,18 +940,7 @@
    <xsl:template match="poam-item"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_poam_metaschema.xml"
-                _key-name="oscal-poam:poam-item"
-                _step="poam-item"
-                _key="poam-items"
-                _key-ref="oscal-poam:poam-item"
-                _using-name="poam-item"
-                _in-xml-name="poam-item"
-                _in-json-name="poam-items"
-                gi="poam-item">
+      <assembly name="poam-item" gi="poam-item">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -1279,19 +985,7 @@
    <xsl:template match="back-matter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -1307,21 +1001,11 @@
    <xsl:template match="remarks"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1338,19 +1022,9 @@
    <xsl:template match="location-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -1361,19 +1035,9 @@
    <xsl:template match="party-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -1384,20 +1048,10 @@
    <xsl:template match="system-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/system-id"
-             _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/system-id"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-id"
              key="system-id"
-             _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"
-             _key-ref="oscal-implementation-common:system-id"
-             _using-name="system-id"
-             _in-xml-name="system-id"
-             _in-json-name="system-id"
              gi="system-id">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-id</xsl:attribute>
@@ -1411,20 +1065,7 @@
    <xsl:template match="threat-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/threat-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/threat-ids"
-             collapsible="no"
-             as-type="uri"
-             name="threat-id"
-             _base-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"
-             _key-ref="oscal-assessment-common:threat-id"
-             _using-name="threat-id"
-             _in-xml-name="threat-id"
-             _in-json-name="threat-ids"
-             gi="threat-id">
+      <field collapsible="no" as-type="uri" name="threat-id" gi="threat-id">
          <xsl:apply-templates select="@system"/>
          <xsl:apply-templates select="@href"/>
          <value as-type="uri" key="id" in-json="string">
@@ -1435,20 +1076,10 @@
    <xsl:template match="status-change"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/status-change"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/status-change"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-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"
-             _key-ref="oscal-assessment-common:risk-status"
-             _using-name="status-change"
-             _in-xml-name="status-change"
-             _in-json-name="status-change"
              gi="status-change"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1462,20 +1093,7 @@
    <xsl:template match="hash"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
          <value as-type="string" key="value" in-json="string">
             <xsl:value-of select="."/>
@@ -1486,15 +1104,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/uuid"
-            _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1503,15 +1114,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1520,33 +1124,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1554,15 +1140,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -1571,15 +1150,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1588,15 +1160,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1605,15 +1170,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -1622,18 +1180,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1643,33 +1191,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="role/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1677,15 +1207,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1694,18 +1217,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1715,15 +1228,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1732,15 +1238,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1749,15 +1248,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1767,15 +1259,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1784,15 +1269,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1801,15 +1279,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/import-ssp/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/import-ssp/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1818,15 +1289,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="identifier-type"
-            _key="identifier-type"
-            _metaschema-xml-id="/field/oscal-implementation-common/system-id/identifier-type"
-            _metaschema-json-id="/field/oscal-implementation-common/system-id/identifier-type"
             name="identifier-type"
             key="identifier-type"
-            _using-name="identifier-type"
-            _in-xml-name="identifier-type"
-            _in-json-name="identifier-type"
             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1835,15 +1299,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1852,18 +1309,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/type"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:system-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-implementation-common:system-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1873,15 +1320,8 @@
                  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-implementation-common/system-component/status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -1890,15 +1330,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1907,15 +1340,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1924,15 +1350,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1941,15 +1360,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -1958,15 +1370,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -1975,15 +1380,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -1992,15 +1390,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2010,15 +1401,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2027,15 +1411,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2044,15 +1421,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2061,15 +1431,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="actor-uuid"
-            _key="actor-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
             name="actor-uuid"
             key="actor-uuid"
-            _using-name="actor-uuid"
-            _in-xml-name="actor-uuid"
-            _in-json-name="actor-uuid"
             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2078,15 +1441,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2095,15 +1451,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2112,15 +1461,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2129,18 +1471,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2149,18 +1481,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2170,15 +1492,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="subject-placeholder-uuid"
-            _key="subject-placeholder-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
             name="subject-placeholder-uuid"
             key="subject-placeholder-uuid"
-            _using-name="subject-placeholder-uuid"
-            _in-xml-name="subject-placeholder-uuid"
-            _in-json-name="subject-placeholder-uuid"
             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2187,18 +1502,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2207,18 +1512,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2228,15 +1523,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2245,15 +1533,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2262,15 +1543,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/system"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -2279,15 +1553,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/href"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2297,15 +1564,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -2315,15 +1575,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/system"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -2333,15 +1586,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/value"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -2351,15 +1597,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2369,15 +1608,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="implementation-uuid"
-            _key="implementation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/implementation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/implementation-uuid"
             name="implementation-uuid"
             key="implementation-uuid"
-            _using-name="implementation-uuid"
-            _in-xml-name="implementation-uuid"
-            _in-json-name="implementation-uuid"
             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2387,15 +1619,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2405,15 +1630,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="lifecycle"
-            _key="lifecycle"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/lifecycle"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/lifecycle"
             name="lifecycle"
             key="lifecycle"
-            _using-name="lifecycle"
-            _in-xml-name="lifecycle"
-            _in-json-name="lifecycle"
             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
@@ -2423,15 +1641,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2440,15 +1651,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2457,15 +1661,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2475,15 +1672,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="date"
-            _key="date"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
             name="date"
             key="date"
-            _using-name="date"
-            _in-xml-name="date"
-            _in-json-name="date"
             gi="date">
          <xsl:value-of select="."/>
       </flag>
@@ -2493,15 +1683,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -2511,15 +1694,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -2529,15 +1705,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="positiveInteger"
-            _step="period"
-            _key="period"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
             name="period"
             key="period"
-            _using-name="period"
-            _in-xml-name="period"
-            _in-json-name="period"
             gi="period">
          <xsl:value-of select="."/>
       </flag>
@@ -2547,15 +1716,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="unit"
-            _key="unit"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
             name="unit"
             key="unit"
-            _using-name="unit"
-            _in-xml-name="unit"
-            _in-json-name="unit"
             gi="unit">
          <xsl:value-of select="."/>
       </flag>
@@ -2565,15 +1727,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2583,15 +1738,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="activity-uuid"
-            _key="activity-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/activity-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/activity-uuid"
             name="activity-uuid"
             key="activity-uuid"
-            _using-name="activity-uuid"
-            _in-xml-name="activity-uuid"
-            _in-json-name="activity-uuid"
             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2601,15 +1749,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2618,15 +1759,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="party-uuid"
-            _key="party-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
             name="party-uuid"
             key="party-uuid"
-            _using-name="party-uuid"
-            _in-xml-name="party-uuid"
-            _in-json-name="party-uuid"
             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2635,15 +1769,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2653,15 +1780,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="response-uuid"
-            _key="response-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response/response-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses/response-uuid"
             name="response-uuid"
             key="response-uuid"
-            _using-name="response-uuid"
-            _in-xml-name="response-uuid"
-            _in-json-name="response-uuid"
             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2671,15 +1791,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2688,15 +1801,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2706,15 +1812,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2724,15 +1823,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="risk-uuid"
-            _key="risk-uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/associated-risk/risk-uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/related-risks/risk-uuid"
             name="risk-uuid"
             key="risk-uuid"
-            _using-name="risk-uuid"
-            _in-xml-name="risk-uuid"
-            _in-json-name="risk-uuid"
             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2742,15 +1834,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2760,15 +1845,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2777,18 +1855,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2797,15 +1865,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -2815,15 +1876,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -2832,18 +1886,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2852,17 +1896,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2877,20 +1914,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2905,20 +1932,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2933,20 +1950,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2961,20 +1968,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2989,18 +1986,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -3031,10 +2017,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -3045,17 +2028,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3070,20 +2046,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3098,20 +2064,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3126,20 +2082,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3154,20 +2100,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3182,17 +2118,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3207,19 +2136,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -3231,17 +2150,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3256,17 +2168,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3281,17 +2186,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3306,18 +2204,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3335,17 +2226,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3360,17 +2244,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3385,19 +2262,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -3419,19 +2284,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3443,17 +2298,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3468,17 +2316,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3493,17 +2334,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3518,17 +2352,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3543,19 +2370,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -3567,19 +2384,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -3591,16 +2398,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -3612,17 +2412,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3637,17 +2430,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3662,17 +2448,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3687,16 +2466,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -3708,17 +2480,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3733,19 +2498,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -3757,19 +2512,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -3781,18 +2526,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -3811,19 +2545,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3835,17 +2559,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3860,17 +2577,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3885,17 +2595,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3910,17 +2613,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3935,16 +2631,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -3956,17 +2645,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3981,17 +2663,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4006,18 +2681,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4035,17 +2703,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4060,17 +2721,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4085,16 +2739,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -4106,17 +2751,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4131,17 +2769,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4156,18 +2787,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4185,17 +2809,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4210,17 +2827,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4235,15 +2845,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -4273,17 +2875,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4298,17 +2893,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4323,17 +2911,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4348,18 +2929,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4377,17 +2951,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4402,16 +2969,9 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="method"
-             _key="methods"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/method"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/methods"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="method"
-             _using-name="method"
-             _in-xml-name="method"
-             _in-json-name="methods"
              gi="method"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -4423,16 +2983,9 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="type"
-             _key="types"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/type"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/types"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="type"
-             _using-name="type"
-             _in-xml-name="type"
-             _in-json-name="types"
              gi="type"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -4444,17 +2997,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4469,17 +3015,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4494,17 +3033,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4519,18 +3051,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4548,17 +3073,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4574,15 +3092,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -4593,17 +3104,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4618,17 +3122,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4643,15 +3140,8 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -4670,18 +3160,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4699,17 +3182,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4725,15 +3201,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -4744,17 +3213,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4769,17 +3231,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4794,18 +3249,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -4830,17 +3274,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4855,17 +3292,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4880,15 +3310,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="relevant-evidence"
-                _key="relevant-evidence"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                name="relevant-evidence"
-                _using-name="relevant-evidence"
-                _in-xml-name="relevant-evidence"
-                _in-json-name="relevant-evidence"
-                gi="relevant-evidence">
+      <assembly name="relevant-evidence" gi="relevant-evidence">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -4912,18 +3334,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4941,17 +3356,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4966,17 +3374,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="collected"
-             _key="collected"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/collected"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/collected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="collected"
              key="collected"
-             _using-name="collected"
-             _in-xml-name="collected"
-             _in-json-name="collected"
              gi="collected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4991,17 +3392,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expires"
-             _key="expires"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/expires"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/expires"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="expires"
              key="expires"
-             _using-name="expires"
-             _in-xml-name="expires"
-             _in-json-name="expires"
              gi="expires"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5016,17 +3410,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5041,18 +3428,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5070,18 +3450,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="statement"
-             _key="statement"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/statement"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/statement"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="statement"
              key="statement"
-             _using-name="statement"
-             _in-xml-name="statement"
-             _in-json-name="statement"
              gi="statement"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5099,17 +3472,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5124,17 +3490,10 @@
                  priority="5"
                  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/risk/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/status"
-             collapsible="no"
+      <field 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">
          <xsl:if test="$with-key">
@@ -5149,17 +3508,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5174,17 +3526,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5199,17 +3544,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5224,18 +3562,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5253,17 +3584,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5279,15 +3603,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5298,17 +3615,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5323,17 +3633,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5348,15 +3651,8 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -5375,18 +3671,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5404,17 +3693,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5430,15 +3712,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5449,17 +3724,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5474,17 +3742,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5499,17 +3760,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5524,17 +3778,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5549,17 +3796,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5574,17 +3814,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5599,18 +3832,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5628,17 +3854,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5654,15 +3873,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5673,17 +3885,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5698,17 +3903,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5723,15 +3921,8 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -5750,18 +3941,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5779,17 +3963,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5805,15 +3982,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5824,17 +3994,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5849,17 +4012,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5874,15 +4030,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="facet"
-                _key="facets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet"
-                _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets"
-                name="facet"
-                _using-name="facet"
-                _in-xml-name="facet"
-                _in-json-name="facets"
-                gi="facet">
+      <assembly name="facet" gi="facet">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@system"/>
          <xsl:apply-templates select="@value"/>
@@ -5907,17 +4055,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5932,15 +4073,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="mitigating-factor"
-                _key="mitigating-factors"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors"
-                name="mitigating-factor"
-                _using-name="mitigating-factor"
-                _in-xml-name="mitigating-factor"
-                _in-json-name="mitigating-factors"
-                gi="mitigating-factor">
+      <assembly name="mitigating-factor" gi="mitigating-factor">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@implementation-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -5971,18 +4104,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6000,17 +4126,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6025,18 +4144,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -6061,17 +4169,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6086,17 +4187,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6111,17 +4205,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="deadline"
-             _key="deadline"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/deadline"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/deadline"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="deadline"
              key="deadline"
-             _using-name="deadline"
-             _in-xml-name="deadline"
-             _in-json-name="deadline"
              gi="deadline"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6136,18 +4223,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:response"
-                _step="response"
-                _key="remediations"
-                _key-ref="oscal-assessment-common:response"
-                _using-name="response"
-                _in-xml-name="response"
-                _in-json-name="remediations"
-                gi="response">
+      <assembly name="response" gi="response">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@lifecycle"/>
          <xsl:apply-templates select="title"/>
@@ -6194,17 +4270,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6219,18 +4288,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6248,17 +4310,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6273,17 +4328,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6298,17 +4346,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6323,17 +4364,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6348,18 +4382,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6377,17 +4404,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6403,15 +4423,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -6422,17 +4435,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6447,17 +4453,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6472,15 +4471,8 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -6499,18 +4491,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6528,17 +4513,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6554,15 +4532,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -6573,17 +4544,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6598,17 +4562,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6623,15 +4580,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="required-asset"
-                _key="required-assets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset"
-                _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets"
-                name="required-asset"
-                _using-name="required-asset"
-                _in-xml-name="required-asset"
-                _in-json-name="required-assets"
-                gi="required-asset">
+      <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="@uuid"/>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
@@ -6663,18 +4612,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -6699,17 +4637,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6724,17 +4655,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6749,17 +4673,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6774,18 +4691,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6803,17 +4713,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6828,17 +4731,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6853,18 +4749,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6882,17 +4771,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6907,16 +4789,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -6929,17 +4802,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -6951,15 +4814,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -6973,15 +4829,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -6994,15 +4843,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -7011,15 +4852,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -7056,17 +4889,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7081,17 +4907,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7106,18 +4925,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7135,17 +4947,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7161,15 +4966,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7180,17 +4978,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7205,17 +4996,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7230,18 +5014,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7259,17 +5036,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7285,15 +5055,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7304,17 +5067,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7329,17 +5085,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7354,17 +5103,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7379,16 +5121,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="risk-log"
-                _key="risk-log"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log"
-                name="risk-log"
-                key="risk-log"
-                _using-name="risk-log"
-                _in-xml-name="risk-log"
-                _in-json-name="risk-log"
-                gi="risk-log">
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">risk-log</xsl:attribute>
          </xsl:if>
@@ -7405,15 +5138,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -7455,17 +5180,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7480,18 +5198,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7509,17 +5220,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7534,17 +5238,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7559,17 +5256,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7584,15 +5274,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="related-response"
-                _key="related-responses"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses"
-                name="related-response"
-                _using-name="related-response"
-                _in-xml-name="related-response"
-                _in-json-name="related-responses"
-                gi="related-response">
+      <assembly name="related-response" gi="related-response">
          <xsl:apply-templates select="@response-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -7622,17 +5304,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7647,17 +5322,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7672,17 +5340,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7697,18 +5358,11 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7726,17 +5380,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7752,15 +5399,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7771,17 +5411,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7796,17 +5429,10 @@
                  priority="18"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7821,15 +5447,8 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -7848,18 +5467,11 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7877,17 +5489,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7903,15 +5508,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7922,17 +5520,10 @@
                  priority="20"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7947,17 +5538,10 @@
                  priority="19"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7972,16 +5556,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
@@ -7989,17 +5564,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-poam/poam-item/title"
-             _metaschema-json-id="/assembly/oscal-poam/poam-item/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8014,18 +5582,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-poam/poam-item/description"
-             _metaschema-json-id="/assembly/oscal-poam/poam-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8043,17 +5604,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8068,15 +5622,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="origin"
-                _key="origins"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/origin"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/origins"
-                name="origin"
-                _using-name="origin"
-                _in-xml-name="origin"
-                _in-json-name="origins"
-                gi="origin">
+      <assembly name="origin" gi="origin">
          <xsl:for-each-group select="actor" group-by="true()">
             <group in-json="ARRAY" key="actors">
                <xsl:apply-templates select="current-group()">
@@ -8090,17 +5636,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8115,16 +5654,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/related-observation"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
@@ -8132,16 +5662,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="associated-risk"
-                _key="related-risks"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/associated-risk"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/related-risks"
-                name="associated-risk"
-                _using-name="associated-risk"
-                _in-xml-name="associated-risk"
-                _in-json-name="related-risks"
-                gi="associated-risk">
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="@risk-uuid"/>
       </assembly>
    </xsl:template>
@@ -8149,15 +5670,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -8191,17 +5704,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8216,18 +5722,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8245,19 +5744,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -8269,16 +5758,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -8303,17 +5783,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8328,17 +5801,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8353,15 +5819,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -8377,17 +5835,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
diff --git a/json/convert/oscal_profile_xml-to-json-converter.xsl b/json/convert/oscal_profile_xml-to-json-converter.xsl
index c0de1dede0..396a11c60d 100644
--- a/json/convert/oscal_profile_xml-to-json-converter.xsl
+++ b/json/convert/oscal_profile_xml-to-json-converter.xsl
@@ -83,14 +83,7 @@
    <xsl:template match="profile"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile"
-                _metaschema-json-id="/assembly/oscal-profile/profile"
-                name="profile"
-                key="profile"
-                _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">
+      <assembly name="profile" key="profile" gi="profile">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">profile</xsl:attribute>
          </xsl:if>
@@ -114,19 +107,7 @@
    <xsl:template match="metadata"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -191,18 +172,7 @@
    <xsl:template match="prop"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@ns"/>
@@ -214,18 +184,7 @@
    <xsl:template match="link"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
@@ -235,18 +194,7 @@
    <xsl:template match="role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -271,18 +219,7 @@
    <xsl:template match="location"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="address"/>
@@ -327,18 +264,7 @@
    <xsl:template match="party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="name"/>
@@ -405,18 +331,7 @@
    <xsl:template match="responsible-party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="party-uuid" group-by="true()">
             <group in-json="ARRAY" key="party-uuids">
@@ -445,18 +360,7 @@
    <xsl:template match="import"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:import"
-                _step="import"
-                _key="imports"
-                _key-ref="oscal-profile:import"
-                _using-name="import"
-                _in-xml-name="import"
-                _in-json-name="imports"
-                gi="import">
+      <assembly name="import" gi="import">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="include-all"/>
          <xsl:for-each-group select="include-controls" group-by="true()">
@@ -479,18 +383,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                _metaschema-xml-id="/assembly/oscal-profile/import/include-all"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:include-all"
-                _step="include-all"
-                _key="include-all"
-                _key-ref="oscal-profile:include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -500,19 +394,7 @@
    <xsl:template match="merge"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/merge"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:merge"
-                _step="merge"
-                _key="merge"
-                _key-ref="oscal-profile:merge"
-                _using-name="merge"
-                _in-xml-name="merge"
-                _in-json-name="merge"
-                gi="merge">
+      <assembly name="merge" key="merge" gi="merge">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">merge</xsl:attribute>
          </xsl:if>
@@ -524,20 +406,7 @@
    <xsl:template match="combine"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _metaschema-xml-id="/assembly/oscal-profile/merge/combine"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:combine"
-                _step="combine"
-                _key="combine"
-                _key-ref="oscal-profile:combine"
-                _using-name="combine"
-                _in-xml-name="combine"
-                _in-json-name="combine"
-                gi="combine">
+      <assembly as-type="empty" name="combine" key="combine" gi="combine">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">combine</xsl:attribute>
          </xsl:if>
@@ -547,19 +416,7 @@
    <xsl:template match="custom"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/merge/custom"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:custom"
-                _step="custom"
-                _key="custom"
-                _key-ref="oscal-profile:custom"
-                _using-name="custom"
-                _in-xml-name="custom"
-                _in-json-name="custom"
-                gi="custom">
+      <assembly name="custom" key="custom" gi="custom">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">custom</xsl:attribute>
          </xsl:if>
@@ -582,18 +439,7 @@
    <xsl:template match="group"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:group"
-                _step="group"
-                _key="groups"
-                _key-ref="oscal-profile:group"
-                _using-name="group"
-                _in-xml-name="group"
-                _in-json-name="groups"
-                gi="group">
+      <assembly name="group" gi="group">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="title"/>
@@ -644,18 +490,7 @@
    <xsl:template match="param"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter"
-                _step="param"
-                _key="params"
-                _key-ref="oscal-catalog-common:parameter"
-                _using-name="param"
-                _in-xml-name="param"
-                _in-json-name="params"
-                gi="param">
+      <assembly name="parameter" gi="param">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="@depends-on"/>
@@ -703,18 +538,7 @@
    <xsl:template match="constraint"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-constraint"
-                _step="constraint"
-                _key="constraints"
-                _key-ref="oscal-catalog-common:parameter-constraint"
-                _using-name="constraint"
-                _in-xml-name="constraint"
-                _in-json-name="constraints"
-                gi="constraint">
+      <assembly name="parameter-constraint" gi="constraint">
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="test" group-by="true()">
             <group in-json="ARRAY" key="tests">
@@ -728,36 +552,18 @@
    <xsl:template match="guideline"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-guideline"
-                _step="guideline"
-                _key="guidelines"
-                _key-ref="oscal-catalog-common:parameter-guideline"
-                _using-name="guideline"
-                _in-xml-name="guideline"
-                _in-json-name="guidelines"
-                gi="guideline">
+      <assembly name="parameter-guideline" gi="guideline">
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
                              group-by="true()">
             <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">
+                   key="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-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -768,19 +574,7 @@
    <xsl:template match="select"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/select"
-                _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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-selection"
-                _step="select"
-                _key="select"
-                _key-ref="oscal-catalog-common:parameter-selection"
-                _using-name="select"
-                _in-xml-name="select"
-                _in-json-name="select"
-                gi="select">
+      <assembly name="parameter-selection" key="select" gi="select">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">select</xsl:attribute>
          </xsl:if>
@@ -797,18 +591,7 @@
    <xsl:template match="part"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-catalog-common:part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="part" gi="part">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@ns"/>
@@ -824,21 +607,14 @@
          <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">
+                   key="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-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                       _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
@@ -863,18 +639,7 @@
    <xsl:template match="insert-controls"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:insert-controls"
-                _step="insert-controls"
-                _key="insert-controls"
-                _key-ref="oscal-profile:insert-controls"
-                _using-name="insert-controls"
-                _in-xml-name="insert-controls"
-                _in-json-name="insert-controls"
-                gi="insert-controls">
+      <assembly name="insert-controls" gi="insert-controls">
          <xsl:apply-templates select="@order"/>
          <xsl:apply-templates select="include-all"/>
          <xsl:for-each-group select="include-controls" group-by="true()">
@@ -896,19 +661,7 @@
    <xsl:template match="modify"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/modify"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:modify"
-                _step="modify"
-                _key="modify"
-                _key-ref="oscal-profile:modify"
-                _using-name="modify"
-                _in-xml-name="modify"
-                _in-json-name="modify"
-                gi="modify">
+      <assembly name="modify" key="modify" gi="modify">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">modify</xsl:attribute>
          </xsl:if>
@@ -931,18 +684,7 @@
    <xsl:template match="alter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:alter"
-                _step="alter"
-                _key="alters"
-                _key-ref="oscal-profile:alter"
-                _using-name="alter"
-                _in-xml-name="alter"
-                _in-json-name="alters"
-                gi="alter">
+      <assembly name="alter" gi="alter">
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="remove" group-by="true()">
             <group in-json="ARRAY" key="removes">
@@ -963,19 +705,7 @@
    <xsl:template match="remove"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:remove"
-                _step="remove"
-                _key="removes"
-                _key-ref="oscal-profile:remove"
-                _using-name="remove"
-                _in-xml-name="remove"
-                _in-json-name="removes"
-                gi="remove">
+      <assembly as-type="empty" name="remove" gi="remove">
          <xsl:apply-templates select="@by-name"/>
          <xsl:apply-templates select="@by-class"/>
          <xsl:apply-templates select="@by-id"/>
@@ -985,18 +715,7 @@
    </xsl:template>
    <xsl:template match="add" xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:add"
-                _step="add"
-                _key="adds"
-                _key-ref="oscal-profile:add"
-                _using-name="add"
-                _in-xml-name="add"
-                _in-json-name="adds"
-                gi="add">
+      <assembly name="add" gi="add">
          <xsl:apply-templates select="@position"/>
          <xsl:apply-templates select="@by-id"/>
          <xsl:apply-templates select="title"/>
@@ -1033,19 +752,7 @@
    <xsl:template match="back-matter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -1061,21 +768,11 @@
    <xsl:template match="remarks"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1092,19 +789,9 @@
    <xsl:template match="location-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -1115,19 +802,9 @@
    <xsl:template match="party-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -1138,20 +815,10 @@
    <xsl:template match="as-is"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-profile/merge/as-is"
-             _metaschema-json-id="/assembly/oscal-profile/merge/as-is"
-             collapsible="no"
+      <field collapsible="no"
              as-type="boolean"
              name="as-is"
              key="as-is"
-             _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"
-             _key-ref="oscal-profile:as-is"
-             _using-name="as-is"
-             _in-xml-name="as-is"
-             _in-json-name="as-is"
              gi="as-is"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1165,19 +832,9 @@
    <xsl:template match="value"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/value"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _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"
-             _key-ref="oscal-catalog-common:parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -1188,20 +845,7 @@
    <xsl:template match="hash"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
          <value as-type="string" key="value" in-json="string">
             <xsl:value-of select="."/>
@@ -1212,15 +856,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-profile/profile/uuid"
-            _metaschema-json-id="/assembly/oscal-profile/profile/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1229,15 +866,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1246,33 +876,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1280,15 +892,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -1297,15 +902,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1314,15 +912,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1331,15 +922,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -1348,18 +932,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1369,33 +943,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="role/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1403,15 +959,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1420,18 +969,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1441,15 +980,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1458,15 +990,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1475,15 +1000,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1493,15 +1011,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1510,15 +1021,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1527,15 +1031,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-profile/import/href"
-            _metaschema-json-id="/assembly/oscal-profile/import/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1544,18 +1041,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-child-controls"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:with-child-controls"
-            _step="with-child-controls"
-            _key="with-child-controls"
-            _key-ref="oscal-profile:with-child-controls"
-            _using-name="with-child-controls"
-            _in-xml-name="with-child-controls"
-            _in-json-name="with-child-controls"
             gi="with-child-controls">
          <xsl:value-of select="."/>
       </flag>
@@ -1564,18 +1051,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching/pattern"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:pattern"
-            _step="pattern"
-            _key="pattern"
-            _key-ref="oscal-profile:pattern"
-            _using-name="pattern"
-            _in-xml-name="pattern"
-            _in-json-name="pattern"
             gi="pattern">
          <xsl:value-of select="."/>
       </flag>
@@ -1584,36 +1061,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-profile/combine/method"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:method"
-            _step="method"
-            _key="method"
-            _key-ref="oscal-profile:method"
-            _using-name="method"
-            _in-xml-name="method"
-            _in-json-name="method"
             gi="method">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-profile/group/id"
-            _metaschema-json-id="/assembly/oscal-profile/group/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1621,33 +1077,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-profile/group/class"
-            _metaschema-json-id="/assembly/oscal-profile/group/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1655,15 +1093,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1672,18 +1103,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/depends-on"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:depends-on"
-            _step="depends-on"
-            _key="depends-on"
-            _key-ref="oscal-catalog-common:depends-on"
-            _using-name="depends-on"
-            _in-xml-name="depends-on"
-            _in-json-name="depends-on"
             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
@@ -1692,33 +1113,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="how-many"
-            _key="how-many"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
             name="how-many"
             key="how-many"
-            _using-name="how-many"
-            _in-xml-name="how-many"
-            _in-json-name="how-many"
             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1726,33 +1129,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/name"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/ns"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1760,15 +1145,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1777,15 +1155,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="order"
-            _key="order"
-            _metaschema-xml-id="/assembly/oscal-profile/insert-controls/order"
-            _metaschema-json-id="/assembly/oscal-profile/insert-controls/order"
             name="order"
             key="order"
-            _using-name="order"
-            _in-xml-name="order"
-            _in-json-name="order"
             gi="order">
          <xsl:value-of select="."/>
       </flag>
@@ -1795,15 +1166,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="param-id"
-            _key="param-id"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/param-id"
-            _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/param-id"
             name="param-id"
             key="param-id"
-            _using-name="param-id"
-            _in-xml-name="param-id"
-            _in-json-name="param-id"
             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1813,15 +1177,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/class"
-            _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1830,18 +1187,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/depends-on"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:depends-on"
-            _step="depends-on"
-            _key="depends-on"
-            _key-ref="oscal-catalog-common:depends-on"
-            _using-name="depends-on"
-            _in-xml-name="depends-on"
-            _in-json-name="depends-on"
             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
@@ -1850,18 +1197,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/alter/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1870,15 +1207,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-name"
-            _key="by-name"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-name"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-name"
             name="by-name"
             key="by-name"
-            _using-name="by-name"
-            _in-xml-name="by-name"
-            _in-json-name="by-name"
             gi="by-name">
          <xsl:value-of select="."/>
       </flag>
@@ -1887,15 +1217,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-class"
-            _key="by-class"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-class"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-class"
             name="by-class"
             key="by-class"
-            _using-name="by-class"
-            _in-xml-name="by-class"
-            _in-json-name="by-class"
             gi="by-class">
          <xsl:value-of select="."/>
       </flag>
@@ -1904,15 +1227,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-id"
-            _key="by-id"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-id"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-id"
             name="by-id"
             key="by-id"
-            _using-name="by-id"
-            _in-xml-name="by-id"
-            _in-json-name="by-id"
             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1921,15 +1237,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-item-name"
-            _key="by-item-name"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-item-name"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-item-name"
             name="by-item-name"
             key="by-item-name"
-            _using-name="by-item-name"
-            _in-xml-name="by-item-name"
-            _in-json-name="by-item-name"
             gi="by-item-name">
          <xsl:value-of select="."/>
       </flag>
@@ -1938,15 +1247,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-ns"
-            _key="by-ns"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-ns"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-ns"
             name="by-ns"
             key="by-ns"
-            _using-name="by-ns"
-            _in-xml-name="by-ns"
-            _in-json-name="by-ns"
             gi="by-ns">
          <xsl:value-of select="."/>
       </flag>
@@ -1955,15 +1257,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="position"
-            _key="position"
-            _metaschema-xml-id="/assembly/oscal-profile/add/position"
-            _metaschema-json-id="/assembly/oscal-profile/add/position"
             name="position"
             key="position"
-            _using-name="position"
-            _in-xml-name="position"
-            _in-json-name="position"
             gi="position">
          <xsl:value-of select="."/>
       </flag>
@@ -1972,15 +1267,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="by-id"
-            _key="by-id"
-            _metaschema-xml-id="/assembly/oscal-profile/add/by-id"
-            _metaschema-json-id="/assembly/oscal-profile/add/by-id"
             name="by-id"
             key="by-id"
-            _using-name="by-id"
-            _in-xml-name="by-id"
-            _in-json-name="by-id"
             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1990,15 +1278,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2008,15 +1289,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2025,18 +1299,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2045,15 +1309,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -2063,15 +1320,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -2080,18 +1330,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2100,17 +1340,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2125,20 +1358,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2153,20 +1376,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2181,20 +1394,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2209,20 +1412,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2237,18 +1430,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -2279,10 +1461,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -2293,17 +1472,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2318,20 +1490,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2346,20 +1508,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2374,20 +1526,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2402,20 +1544,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2430,17 +1562,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2455,19 +1580,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -2479,17 +1594,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2504,17 +1612,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2529,17 +1630,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2554,18 +1648,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2583,17 +1670,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2608,17 +1688,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2633,19 +1706,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -2667,19 +1728,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -2691,17 +1742,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2716,17 +1760,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2741,17 +1778,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2766,17 +1796,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2791,19 +1814,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -2815,19 +1828,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -2839,16 +1842,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -2860,17 +1856,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2885,17 +1874,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2910,17 +1892,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2935,16 +1910,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -2956,17 +1924,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2981,19 +1942,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -3005,19 +1956,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -3029,18 +1970,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -3059,19 +1989,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3083,17 +2003,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3108,17 +2021,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3133,17 +2039,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3158,17 +2057,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3183,16 +2075,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -3204,17 +2089,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3229,18 +2107,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -3262,16 +2129,9 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -3283,16 +2143,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -3300,18 +2151,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -3333,16 +2173,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -3354,16 +2187,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -3371,17 +2195,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-profile/group/title"
-             _metaschema-json-id="/assembly/oscal-profile/group/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3396,17 +2213,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3421,17 +2231,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3446,18 +2249,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3475,18 +2271,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3504,15 +2293,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -3521,17 +2302,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3546,16 +2320,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -3567,17 +2334,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3592,17 +2352,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3617,17 +2370,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3642,18 +2388,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -3675,16 +2410,9 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -3696,16 +2424,7 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -3713,18 +2432,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -3746,16 +2454,9 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -3767,16 +2468,7 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -3784,18 +2476,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -3817,16 +2498,9 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -3838,16 +2512,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -3855,18 +2520,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
          <xsl:for-each-group select="with-id" group-by="true()">
             <group in-json="ARRAY" key="with-ids">
@@ -3888,16 +2542,9 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -3909,16 +2556,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="@pattern"/>
       </assembly>
    </xsl:template>
@@ -3926,15 +2564,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="set-parameter"
-                _key="set-parameters"
-                _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter"
-                _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters"
-                name="set-parameter"
-                _using-name="set-parameter"
-                _in-xml-name="set-parameter"
-                _in-json-name="set-parameters"
-                gi="set-parameter">
+      <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="@param-id"/>
          <xsl:apply-templates select="@class"/>
          <xsl:apply-templates select="@depends-on"/>
@@ -3982,17 +2612,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4007,17 +2630,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/label"
-             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4032,18 +2648,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/usage"
-             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4061,18 +2670,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4090,15 +2692,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -4107,17 +2701,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4132,16 +2719,9 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -4153,17 +2733,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-profile/add/title"
-             _metaschema-json-id="/assembly/oscal-profile/add/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4178,17 +2751,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4203,17 +2769,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4228,18 +2787,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4257,18 +2809,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4286,15 +2831,7 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -4303,17 +2840,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4328,16 +2858,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -4349,17 +2872,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4374,17 +2890,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4399,17 +2908,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4424,15 +2926,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -4466,17 +2960,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4491,18 +2978,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4520,19 +3000,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -4544,16 +3014,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -4578,17 +3039,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4603,17 +3057,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4628,15 +3075,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -4652,17 +3091,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
diff --git a/json/convert/oscal_ssp_xml-to-json-converter.xsl b/json/convert/oscal_ssp_xml-to-json-converter.xsl
index 684d245c9a..c49750e7aa 100644
--- a/json/convert/oscal_ssp_xml-to-json-converter.xsl
+++ b/json/convert/oscal_ssp_xml-to-json-converter.xsl
@@ -83,13 +83,8 @@
    <xsl:template match="system-security-plan"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan"
-                name="system-security-plan"
+      <assembly name="system-security-plan"
                 key="system-security-plan"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-security-plan</xsl:attribute>
@@ -109,19 +104,7 @@
    <xsl:template match="metadata"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -186,18 +169,7 @@
    <xsl:template match="prop"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@ns"/>
@@ -209,18 +181,7 @@
    <xsl:template match="link"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
@@ -230,18 +191,7 @@
    <xsl:template match="role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -266,18 +216,7 @@
    <xsl:template match="location"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="address"/>
@@ -322,18 +261,7 @@
    <xsl:template match="party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="name"/>
@@ -400,18 +328,7 @@
    <xsl:template match="responsible-party"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="party-uuid" group-by="true()">
             <group in-json="ARRAY" key="party-uuids">
@@ -440,19 +357,7 @@
    <xsl:template match="import-profile"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/import-profile"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:import-profile"
-                _step="import-profile"
-                _key="import-profile"
-                _key-ref="oscal-ssp:import-profile"
-                _using-name="import-profile"
-                _in-xml-name="import-profile"
-                _in-json-name="import-profile"
-                gi="import-profile">
+      <assembly name="import-profile" key="import-profile" gi="import-profile">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-profile</xsl:attribute>
          </xsl:if>
@@ -463,18 +368,8 @@
    <xsl:template match="system-characteristics"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
-                name="system-characteristics"
+      <assembly name="system-characteristics"
                 key="system-characteristics"
-                _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"
-                _key-ref="oscal-ssp:system-characteristics"
-                _using-name="system-characteristics"
-                _in-xml-name="system-characteristics"
-                _in-json-name="system-characteristics"
                 gi="system-characteristics">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-characteristics</xsl:attribute>
@@ -524,18 +419,8 @@
    <xsl:template match="system-information"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-information"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-information"
-                name="system-information"
+      <assembly name="system-information"
                 key="system-information"
-                _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"
-                _key-ref="oscal-ssp:system-information"
-                _using-name="system-information"
-                _in-xml-name="system-information"
-                _in-json-name="system-information"
                 gi="system-information">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-information</xsl:attribute>
@@ -566,18 +451,8 @@
    <xsl:template match="security-impact-level"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
-                name="security-impact-level"
+      <assembly name="security-impact-level"
                 key="security-impact-level"
-                _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"
-                _key-ref="oscal-ssp:security-impact-level"
-                _using-name="security-impact-level"
-                _in-xml-name="security-impact-level"
-                _in-json-name="security-impact-level"
                 gi="security-impact-level">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-impact-level</xsl:attribute>
@@ -590,18 +465,8 @@
    <xsl:template match="authorization-boundary"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
-                name="authorization-boundary"
+      <assembly name="authorization-boundary"
                 key="authorization-boundary"
-                _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"
-                _key-ref="oscal-ssp:authorization-boundary"
-                _using-name="authorization-boundary"
-                _in-xml-name="authorization-boundary"
-                _in-json-name="authorization-boundary"
                 gi="authorization-boundary">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">authorization-boundary</xsl:attribute>
@@ -634,18 +499,7 @@
    <xsl:template match="diagram"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:diagram"
-                _step="diagram"
-                _key="diagrams"
-                _key-ref="oscal-ssp:diagram"
-                _using-name="diagram"
-                _in-xml-name="diagram"
-                _in-json-name="diagrams"
-                gi="diagram">
+      <assembly name="diagram" gi="diagram">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -669,18 +523,8 @@
    <xsl:template match="network-architecture"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
-                name="network-architecture"
+      <assembly name="network-architecture"
                 key="network-architecture"
-                _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"
-                _key-ref="oscal-ssp:network-architecture"
-                _using-name="network-architecture"
-                _in-xml-name="network-architecture"
-                _in-json-name="network-architecture"
                 gi="network-architecture">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">network-architecture</xsl:attribute>
@@ -713,19 +557,7 @@
    <xsl:template match="data-flow"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/data-flow"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:data-flow"
-                _step="data-flow"
-                _key="data-flow"
-                _key-ref="oscal-ssp:data-flow"
-                _using-name="data-flow"
-                _in-xml-name="data-flow"
-                _in-json-name="data-flow"
-                gi="data-flow">
+      <assembly name="data-flow" key="data-flow" gi="data-flow">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">data-flow</xsl:attribute>
          </xsl:if>
@@ -757,18 +589,8 @@
    <xsl:template match="system-implementation"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
-                name="system-implementation"
+      <assembly name="system-implementation"
                 key="system-implementation"
-                _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"
-                _key-ref="oscal-ssp:system-implementation"
-                _using-name="system-implementation"
-                _in-xml-name="system-implementation"
-                _in-json-name="system-implementation"
                 gi="system-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-implementation</xsl:attribute>
@@ -821,18 +643,7 @@
    <xsl:template match="user"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-user"
-                _step="user"
-                _key="users"
-                _key-ref="oscal-implementation-common:system-user"
-                _using-name="user"
-                _in-xml-name="user"
-                _in-json-name="users"
-                gi="user">
+      <assembly name="system-user" gi="user">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="short-name"/>
@@ -871,18 +682,7 @@
    <xsl:template match="authorized-privilege"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:authorized-privilege"
-                _step="authorized-privilege"
-                _key="authorized-privileges"
-                _key-ref="oscal-implementation-common:authorized-privilege"
-                _using-name="authorized-privilege"
-                _in-xml-name="authorized-privilege"
-                _in-json-name="authorized-privileges"
-                gi="authorized-privilege">
+      <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="function-performed" group-by="true()">
@@ -897,18 +697,7 @@
    <xsl:template match="component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-implementation-common:system-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="system-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
@@ -949,18 +738,7 @@
    <xsl:template match="responsible-role"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -989,18 +767,7 @@
    <xsl:template match="protocol"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@name"/>
          <xsl:apply-templates select="title"/>
@@ -1016,19 +783,7 @@
    <xsl:template match="port-range"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
          <xsl:apply-templates select="@end"/>
          <xsl:apply-templates select="@transport"/>
@@ -1037,18 +792,7 @@
    <xsl:template match="inventory-item"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:inventory-item"
-                _step="inventory-item"
-                _key="inventory-items"
-                _key-ref="oscal-implementation-common:inventory-item"
-                _using-name="inventory-item"
-                _in-xml-name="inventory-item"
-                _in-json-name="inventory-items"
-                gi="inventory-item">
+      <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1085,18 +829,7 @@
    <xsl:template match="set-parameter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:set-parameter"
-                _step="set-parameter"
-                _key="set-parameters"
-                _key-ref="oscal-implementation-common:set-parameter"
-                _using-name="set-parameter"
-                _in-xml-name="set-parameter"
-                _in-json-name="set-parameters"
-                gi="set-parameter">
+      <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="@param-id"/>
          <xsl:for-each-group select="value" group-by="true()">
             <group in-json="ARRAY" key="values">
@@ -1111,18 +844,7 @@
    <xsl:template match="by-component"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:by-component"
-                _step="by-component"
-                _key="by-components"
-                _key-ref="oscal-ssp:by-component"
-                _using-name="by-component"
-                _in-xml-name="by-component"
-                _in-json-name="by-components"
-                gi="by-component">
+      <assembly name="by-component" gi="by-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
@@ -1176,18 +898,8 @@
    <xsl:template match="implementation-status"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/by-component/implementation-status"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/implementation-status"
-                name="implementation-status"
+      <assembly name="implementation-status"
                 key="implementation-status"
-                _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"
-                _key-ref="oscal-implementation-common:implementation-status"
-                _using-name="implementation-status"
-                _in-xml-name="implementation-status"
-                _in-json-name="implementation-status"
                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
@@ -1199,19 +911,7 @@
    <xsl:template match="back-matter"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -1227,21 +927,11 @@
    <xsl:template match="remarks"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1258,19 +948,9 @@
    <xsl:template match="location-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -1281,19 +961,9 @@
    <xsl:template match="party-uuid"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -1304,19 +974,9 @@
    <xsl:template match="system-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-id"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-id"
-             _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"
-             _key-ref="oscal-implementation-common:system-id"
-             _using-name="system-id"
-             _in-xml-name="system-id"
-             _in-json-name="system-ids"
              gi="system-id">
          <xsl:apply-templates select="@identifier-type"/>
          <value as-type="string" key="id" in-json="string">
@@ -1327,19 +987,9 @@
    <xsl:template match="role-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/role-id"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/role-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="role-id"
-             _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"
-             _key-ref="oscal-metadata:role-id"
-             _using-name="role-id"
-             _in-xml-name="role-id"
-             _in-json-name="role-ids"
              gi="role-id"
              in-json="SCALAR">
          <value as-type="token" in-json="string">
@@ -1350,19 +1000,9 @@
    <xsl:template match="function-performed"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/function-performed"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/functions-performed"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="function-performed"
-             _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"
-             _key-ref="oscal-implementation-common:function-performed"
-             _using-name="function-performed"
-             _in-xml-name="function-performed"
-             _in-json-name="functions-performed"
              gi="function-performed"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -1373,20 +1013,7 @@
    <xsl:template match="hash"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
          <value as-type="string" key="value" in-json="string">
             <xsl:value-of select="."/>
@@ -1397,15 +1024,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1414,15 +1034,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1431,33 +1044,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1465,15 +1060,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -1482,15 +1070,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1499,15 +1080,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1516,15 +1090,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -1533,18 +1100,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1554,33 +1111,15 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="role/@id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1588,15 +1127,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1605,18 +1137,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1626,15 +1148,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1643,15 +1158,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1660,15 +1168,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1678,15 +1179,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1695,15 +1189,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1712,15 +1199,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-ssp/import-profile/href"
-            _metaschema-json-id="/assembly/oscal-ssp/import-profile/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1729,15 +1209,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="identifier-type"
-            _key="identifier-type"
-            _metaschema-xml-id="/field/oscal-implementation-common/system-id/identifier-type"
-            _metaschema-json-id="/field/oscal-implementation-common/system-id/identifier-type"
             name="identifier-type"
             key="identifier-type"
-            _using-name="identifier-type"
-            _in-xml-name="identifier-type"
-            _in-json-name="identifier-type"
             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1747,15 +1220,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1765,15 +1231,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization/system"
-            _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -1783,15 +1242,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-ssp/status/state"
-            _metaschema-json-id="/assembly/oscal-ssp/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -1800,15 +1252,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/diagram/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/diagram/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1818,15 +1263,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1835,15 +1273,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-user/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1852,15 +1283,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1869,18 +1293,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/type"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:system-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-implementation-common:system-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1890,15 +1304,8 @@
                  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-implementation-common/system-component/status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -1907,15 +1314,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1924,15 +1324,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1941,15 +1334,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1958,15 +1344,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -1975,15 +1354,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -1992,15 +1364,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -2009,15 +1374,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2027,15 +1385,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2044,18 +1395,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/param-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:param-id"
-            _step="param-id"
-            _key="param-id"
-            _key-ref="oscal-implementation-common:param-id"
-            _using-name="param-id"
-            _in-xml-name="param-id"
-            _in-json-name="param-id"
             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2065,15 +1406,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2082,18 +1416,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2102,18 +1426,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-ssp/statement/statement-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:statement-id"
-            _step="statement-id"
-            _key="statement-id"
-            _key-ref="oscal-implementation-common:statement-id"
-            _using-name="statement-id"
-            _in-xml-name="statement-id"
-            _in-json-name="statement-id"
             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2123,15 +1437,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/statement/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/statement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2140,15 +1447,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2157,15 +1457,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2174,15 +1467,8 @@
                  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-implementation-common/implementation-status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/implementation-status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -2192,15 +1478,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2210,15 +1489,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2227,18 +1499,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/provided-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:provided-uuid"
-            _step="provided-uuid"
-            _key="provided-uuid"
-            _key-ref="oscal-ssp:provided-uuid"
-            _using-name="provided-uuid"
-            _in-xml-name="provided-uuid"
-            _in-json-name="provided-uuid"
             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2248,15 +1510,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2265,18 +1520,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/provided-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:provided-uuid"
-            _step="provided-uuid"
-            _key="provided-uuid"
-            _key-ref="oscal-ssp:provided-uuid"
-            _using-name="provided-uuid"
-            _in-xml-name="provided-uuid"
-            _in-json-name="provided-uuid"
             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2286,15 +1531,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2303,18 +1541,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/responsibility-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:responsibility-uuid"
-            _step="responsibility-uuid"
-            _key="responsibility-uuid"
-            _key-ref="oscal-ssp:responsibility-uuid"
-            _using-name="responsibility-uuid"
-            _in-xml-name="responsibility-uuid"
-            _in-json-name="responsibility-uuid"
             gi="responsibility-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2324,15 +1552,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2342,15 +1563,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2359,18 +1573,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2379,15 +1583,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -2397,15 +1594,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -2414,18 +1604,8 @@
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2434,17 +1614,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2459,20 +1632,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2487,20 +1650,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2515,20 +1668,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2543,20 +1686,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2571,18 +1704,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="published"/>
          <xsl:apply-templates select="last-modified"/>
@@ -2613,10 +1735,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -2627,17 +1746,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2652,20 +1764,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2680,20 +1782,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2708,20 +1800,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2736,20 +1818,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2764,17 +1836,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2789,19 +1854,9 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -2813,17 +1868,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2838,17 +1886,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2863,17 +1904,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2888,18 +1922,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2917,17 +1944,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2942,17 +1962,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2967,19 +1980,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -3001,19 +2002,9 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3025,17 +2016,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3050,17 +2034,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3075,17 +2052,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3100,17 +2070,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3125,19 +2088,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -3149,19 +2102,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -3173,16 +2116,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <value as-type="uri" in-json="string">
@@ -3194,17 +2130,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3219,17 +2148,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3244,17 +2166,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3269,16 +2184,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
@@ -3290,17 +2198,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3315,19 +2216,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <value as-type="email" in-json="string">
@@ -3339,19 +2230,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
@@ -3363,18 +2244,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -3393,19 +2263,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3417,17 +2277,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3442,17 +2295,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3467,17 +2313,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3492,17 +2331,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3517,16 +2349,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
@@ -3538,17 +2363,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3563,17 +2381,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="system-name"
-             _key="system-name"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-name"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-name"
              key="system-name"
-             _using-name="system-name"
-             _in-xml-name="system-name"
-             _in-json-name="system-name"
              gi="system-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3588,17 +2399,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="system-name-short"
-             _key="system-name-short"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-name-short"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-name-short"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-name-short"
              key="system-name-short"
-             _using-name="system-name-short"
-             _in-xml-name="system-name-short"
-             _in-json-name="system-name-short"
              gi="system-name-short"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3613,18 +2417,11 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/description"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3642,17 +2439,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3667,20 +2457,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/date-authorized"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/date-authorized"
-             collapsible="no"
+      <field collapsible="no"
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _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"
-             _key-ref="oscal-ssp:date-authorized"
-             _using-name="date-authorized"
-             _in-xml-name="date-authorized"
-             _in-json-name="date-authorized"
              gi="date-authorized"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3695,17 +2475,10 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="security-sensitivity-level"
-             _key="security-sensitivity-level"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/security-sensitivity-level"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-sensitivity-level"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-sensitivity-level"
              key="security-sensitivity-level"
-             _using-name="security-sensitivity-level"
-             _in-xml-name="security-sensitivity-level"
-             _in-json-name="security-sensitivity-level"
              gi="security-sensitivity-level"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3720,17 +2493,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3745,15 +2511,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="information-type"
-                _key="information-types"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types"
-                name="information-type"
-                _using-name="information-type"
-                _in-xml-name="information-type"
-                _in-json-name="information-types"
-                gi="information-type">
+      <assembly name="information-type" gi="information-type">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -3787,17 +2545,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/title"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3812,18 +2563,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/description"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3841,15 +2585,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="categorization"
-                _key="categorizations"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations"
-                name="categorization"
-                _using-name="categorization"
-                _in-xml-name="categorization"
-                _in-json-name="categorizations"
-                gi="categorization">
+      <assembly name="categorization" gi="categorization">
          <xsl:apply-templates select="@system"/>
          <xsl:for-each-group select="information-type-id" group-by="true()">
             <group in-json="ARRAY" key="information-type-ids">
@@ -3864,16 +2600,9 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="information-type-id"
-             _key="information-type-ids"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization/information-type-id"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations/information-type-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="information-type-id"
-             _using-name="information-type-id"
-             _in-xml-name="information-type-id"
-             _in-json-name="information-type-ids"
              gi="information-type-id"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3885,17 +2614,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3910,15 +2632,8 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="confidentiality-impact"
-                _key="confidentiality-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact"
-                name="confidentiality-impact"
+      <assembly name="confidentiality-impact"
                 key="confidentiality-impact"
-                _using-name="confidentiality-impact"
-                _in-xml-name="confidentiality-impact"
-                _in-json-name="confidentiality-impact"
                 gi="confidentiality-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
@@ -3946,17 +2661,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3971,20 +2679,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3999,20 +2697,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4027,21 +2715,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4059,15 +2737,8 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="integrity-impact"
-                _key="integrity-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact"
-                name="integrity-impact"
+      <assembly name="integrity-impact"
                 key="integrity-impact"
-                _using-name="integrity-impact"
-                _in-xml-name="integrity-impact"
-                _in-json-name="integrity-impact"
                 gi="integrity-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">integrity-impact</xsl:attribute>
@@ -4095,17 +2766,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4120,20 +2784,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4148,20 +2802,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4176,21 +2820,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4208,15 +2842,8 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="availability-impact"
-                _key="availability-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact"
-                name="availability-impact"
+      <assembly name="availability-impact"
                 key="availability-impact"
-                _using-name="availability-impact"
-                _in-xml-name="availability-impact"
-                _in-json-name="availability-impact"
                 gi="availability-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">availability-impact</xsl:attribute>
@@ -4244,17 +2871,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4269,20 +2889,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4297,20 +2907,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4325,21 +2925,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4357,17 +2947,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="security-objective-confidentiality"
-             _key="security-objective-confidentiality"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-confidentiality"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-confidentiality"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-confidentiality"
              key="security-objective-confidentiality"
-             _using-name="security-objective-confidentiality"
-             _in-xml-name="security-objective-confidentiality"
-             _in-json-name="security-objective-confidentiality"
              gi="security-objective-confidentiality"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4382,17 +2965,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="security-objective-integrity"
-             _key="security-objective-integrity"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-integrity"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-integrity"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-integrity"
              key="security-objective-integrity"
-             _using-name="security-objective-integrity"
-             _in-xml-name="security-objective-integrity"
-             _in-json-name="security-objective-integrity"
              gi="security-objective-integrity"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4407,17 +2983,10 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="security-objective-availability"
-             _key="security-objective-availability"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-availability"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-availability"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-availability"
              key="security-objective-availability"
-             _using-name="security-objective-availability"
-             _in-xml-name="security-objective-availability"
-             _in-json-name="security-objective-availability"
              gi="security-objective-availability"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4432,19 +3001,7 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/status"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:status"
-                _step="status"
-                _key="status"
-                _key-ref="oscal-ssp:status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -4456,18 +3013,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/description"
-             _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4485,17 +3035,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4510,18 +3053,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4539,17 +3075,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4564,17 +3093,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4589,18 +3111,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4618,18 +3133,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4647,18 +3155,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/network-architecture/description"
-             _metaschema-json-id="/assembly/oscal-ssp/network-architecture/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4676,17 +3177,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4701,18 +3195,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4730,17 +3217,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4755,17 +3235,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4780,18 +3253,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4809,18 +3275,11 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/data-flow/description"
-             _metaschema-json-id="/assembly/oscal-ssp/data-flow/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4838,17 +3297,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4863,18 +3315,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4892,17 +3337,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4917,17 +3355,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4942,18 +3373,11 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4971,17 +3395,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4996,17 +3413,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5021,15 +3431,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="leveraged-authorization"
-                _key="leveraged-authorizations"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization"
-                _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations"
-                name="leveraged-authorization"
-                _using-name="leveraged-authorization"
-                _in-xml-name="leveraged-authorization"
-                _in-json-name="leveraged-authorizations"
-                gi="leveraged-authorization">
+      <assembly name="leveraged-authorization" gi="leveraged-authorization">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -5055,17 +3457,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/title"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5080,17 +3475,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5105,17 +3493,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="party-uuid"
-             _key="party-uuid"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/party-uuid"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/party-uuid"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
              key="party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuid"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5130,20 +3511,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/date-authorized"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/date-authorized"
-             collapsible="no"
+      <field collapsible="no"
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _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"
-             _key-ref="oscal-ssp:date-authorized"
-             _using-name="date-authorized"
-             _in-xml-name="date-authorized"
-             _in-json-name="date-authorized"
              gi="date-authorized"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5158,17 +3529,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5183,17 +3547,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5208,18 +3565,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5237,17 +3587,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5262,17 +3605,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5287,18 +3623,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5316,17 +3645,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5341,18 +3663,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5370,17 +3685,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5395,17 +3703,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5420,16 +3721,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -5441,17 +3733,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5466,17 +3751,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5491,18 +3769,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5520,17 +3791,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5545,17 +3809,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5570,15 +3827,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -5608,17 +3857,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5633,17 +3875,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5658,18 +3893,8 @@
                  priority="3"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
-                name="control-implementation"
+      <assembly name="control-implementation"
                 key="control-implementation"
-                _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"
-                _key-ref="oscal-ssp:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementation"
                 gi="control-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">control-implementation</xsl:attribute>
@@ -5695,18 +3920,11 @@
                  priority="4"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-ssp/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5724,16 +3942,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -5745,18 +3956,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-ssp:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@control-id"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -5808,17 +4008,10 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5833,16 +4026,9 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -5854,17 +4040,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5879,18 +4058,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-ssp:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
          <xsl:apply-templates select="@uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -5928,17 +4096,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5953,17 +4114,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5978,18 +4132,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6007,17 +4154,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6032,16 +4172,9 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -6053,16 +4186,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="export"
-                _key="export"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export"
-                name="export"
-                key="export"
-                _using-name="export"
-                _in-xml-name="export"
-                _in-json-name="export"
-                gi="export">
+      <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">export</xsl:attribute>
          </xsl:if>
@@ -6102,18 +4226,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6131,17 +4248,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6156,15 +4266,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="provided"
-                _key="provided"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided"
-                name="provided"
-                _using-name="provided"
-                _in-xml-name="provided"
-                _in-json-name="provided"
-                gi="provided">
+      <assembly name="provided" gi="provided">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -6195,18 +4297,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6224,17 +4319,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6249,17 +4337,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6274,15 +4355,7 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="responsibility"
-                _key="responsibilities"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities"
-                name="responsibility"
-                _using-name="responsibility"
-                _in-xml-name="responsibility"
-                _in-json-name="responsibilities"
-                gi="responsibility">
+      <assembly name="responsibility" gi="responsibility">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@provided-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -6314,18 +4387,11 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6343,17 +4409,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6368,17 +4427,10 @@
                  priority="17"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6393,15 +4445,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="inherited"
-                _key="inherited"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited"
-                name="inherited"
-                _using-name="inherited"
-                _in-xml-name="inherited"
-                _in-json-name="inherited"
-                gi="inherited">
+      <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@provided-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -6432,18 +4476,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6461,17 +4498,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6486,17 +4516,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6511,15 +4534,7 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="satisfied"
-                _key="satisfied"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied"
-                name="satisfied"
-                _using-name="satisfied"
-                _in-xml-name="satisfied"
-                _in-json-name="satisfied"
-                gi="satisfied">
+      <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@responsibility-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -6551,18 +4566,11 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6580,17 +4588,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6605,17 +4606,10 @@
                  priority="16"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6630,17 +4624,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6655,18 +4642,11 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6684,17 +4664,10 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6709,16 +4682,9 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -6730,16 +4696,7 @@
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="export"
-                _key="export"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export"
-                name="export"
-                key="export"
-                _using-name="export"
-                _in-xml-name="export"
-                _in-json-name="export"
-                gi="export">
+      <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">export</xsl:attribute>
          </xsl:if>
@@ -6779,18 +4736,11 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6808,17 +4758,10 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6833,15 +4776,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="provided"
-                _key="provided"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided"
-                name="provided"
-                _using-name="provided"
-                _in-xml-name="provided"
-                _in-json-name="provided"
-                gi="provided">
+      <assembly name="provided" gi="provided">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -6872,18 +4807,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6901,17 +4829,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6926,17 +4847,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6951,15 +4865,7 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="responsibility"
-                _key="responsibilities"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities"
-                name="responsibility"
-                _using-name="responsibility"
-                _in-xml-name="responsibility"
-                _in-json-name="responsibilities"
-                gi="responsibility">
+      <assembly name="responsibility" gi="responsibility">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@provided-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -6991,18 +4897,11 @@
                  priority="11"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7020,17 +4919,10 @@
                  priority="13"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7045,17 +4937,10 @@
                  priority="15"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7070,15 +4955,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="inherited"
-                _key="inherited"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited"
-                name="inherited"
-                _using-name="inherited"
-                _in-xml-name="inherited"
-                _in-json-name="inherited"
-                gi="inherited">
+      <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@provided-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -7109,18 +4986,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7138,17 +5008,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7163,17 +5026,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7188,15 +5044,7 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="satisfied"
-                _key="satisfied"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied"
-                name="satisfied"
-                _using-name="satisfied"
-                _in-xml-name="satisfied"
-                _in-json-name="satisfied"
-                gi="satisfied">
+      <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="@responsibility-uuid"/>
          <xsl:apply-templates select="description"/>
@@ -7228,18 +5076,11 @@
                  priority="10"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7257,17 +5098,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7282,17 +5116,10 @@
                  priority="14"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7307,17 +5134,10 @@
                  priority="12"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7332,15 +5152,7 @@
                  priority="5"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
@@ -7374,17 +5186,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7399,18 +5204,11 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7428,19 +5226,9 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
@@ -7452,16 +5240,7 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -7486,17 +5265,10 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7511,17 +5283,10 @@
                  priority="9"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7536,15 +5301,7 @@
                  priority="7"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@media-type"/>
          <xsl:for-each-group select="hash" group-by="true()">
@@ -7560,17 +5317,10 @@
                  priority="6"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
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 c7658d7e26..27aec3b294 100644
--- a/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
@@ -74,14 +74,7 @@
    <xsl:template match="j:map[@key='assessment-plan']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan"
-                _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/src/metaschema/oscal_assessment-plan_metaschema.xml"
-                _key-name="oscal-ap:assessment-plan"
-                _using-root-name="assessment-plan"
-                gi="assessment-plan">
+      <assembly name="assessment-plan" key="assessment-plan" gi="assessment-plan">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-plan</xsl:attribute>
          </xsl:if>
@@ -103,19 +96,7 @@
    <xsl:template match="j:map[@key='metadata']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="metadata" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -138,18 +119,7 @@
    <xsl:template match="j:array[@key='props']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="prop" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -161,18 +131,7 @@
    <xsl:template match="j:array[@key='links']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="link" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
@@ -182,18 +141,7 @@
    <xsl:template match="j:array[@key='roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -206,18 +154,7 @@
    <xsl:template match="j:array[@key='locations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='address']"/>
@@ -232,18 +169,7 @@
    <xsl:template match="j:array[@key='parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='name']"/>
@@ -262,18 +188,7 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -284,19 +199,7 @@
    <xsl:template match="j:map[@key='import-ssp']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-ssp" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/import-ssp"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:import-ssp"
-                _step="import-ssp"
-                _key="import-ssp"
-                _key-ref="oscal-assessment-common:import-ssp"
-                _using-name="import-ssp"
-                _in-xml-name="import-ssp"
-                _in-json-name="import-ssp"
-                gi="import-ssp">
+      <assembly name="import-ssp" key="import-ssp" gi="import-ssp">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-ssp</xsl:attribute>
          </xsl:if>
@@ -307,18 +210,7 @@
    <xsl:template match="j:array[@key='components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-implementation-common:system-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="system-component" gi="component">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -335,18 +227,7 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -357,18 +238,7 @@
    <xsl:template match="j:array[@key='protocols']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="protocol" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -378,19 +248,7 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="port-range" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="*[@key='start']"/>
          <xsl:apply-templates select="*[@key='end']"/>
          <xsl:apply-templates select="*[@key='transport']"/>
@@ -399,18 +257,7 @@
    <xsl:template match="j:array[@key='inventory-items']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="inventory-item" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:inventory-item"
-                _step="inventory-item"
-                _key="inventory-items"
-                _key-ref="oscal-implementation-common:inventory-item"
-                _using-name="inventory-item"
-                _in-xml-name="inventory-item"
-                _in-json-name="inventory-items"
-                gi="inventory-item">
+      <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -423,18 +270,7 @@
    <xsl:template match="j:array[@key='users']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="user" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-user"
-                _step="user"
-                _key="users"
-                _key-ref="oscal-implementation-common:system-user"
-                _using-name="user"
-                _in-xml-name="user"
-                _in-json-name="users"
-                gi="user">
+      <assembly name="system-user" gi="user">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -449,18 +285,7 @@
    <xsl:template match="j:array[@key='authorized-privileges']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="authorized-privilege" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:authorized-privilege"
-                _step="authorized-privilege"
-                _key="authorized-privileges"
-                _key-ref="oscal-implementation-common:authorized-privilege"
-                _using-name="authorized-privilege"
-                _in-xml-name="authorized-privilege"
-                _in-json-name="authorized-privileges"
-                gi="authorized-privilege">
+      <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='functions-performed']"/>
@@ -469,18 +294,7 @@
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="objectives-and-methods" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:local-objective"
-                _step="objectives-and-methods"
-                _key="objectives-and-methods"
-                _key-ref="oscal-assessment-common:local-objective"
-                _using-name="objectives-and-methods"
-                _in-xml-name="objectives-and-methods"
-                _in-json-name="objectives-and-methods"
-                gi="objectives-and-methods">
+      <assembly name="local-objective" gi="objectives-and-methods">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -492,18 +306,7 @@
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:array[@key='parts']/j:map | j:array[@key='objectives-and-methods']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="objectives-and-methods/part | objectives-and-methods/part//part" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-catalog-common:part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="part" gi="part">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -518,18 +321,7 @@
    <xsl:template match="j:map[@key='terms-and-conditions']/j:array[@key='parts']/j:map | j:map[@key='terms-and-conditions']/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="terms-and-conditions/part | terms-and-conditions/part//part" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-assessment-common:assessment-part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="assessment-part" gi="part">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -544,18 +336,7 @@
    <xsl:template match="j:array[@key='activities']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="activity" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:activity"
-                _step="activity"
-                _key="activities"
-                _key-ref="oscal-assessment-common:activity"
-                _using-name="activity"
-                _in-xml-name="activity"
-                _in-json-name="activities"
-                gi="activity">
+      <assembly name="activity" gi="activity">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -570,18 +351,8 @@
    <xsl:template match="j:map[@key='reviewed-controls']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="reviewed-controls" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/reviewed-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="reviewed-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="reviewed-controls"
-                _in-xml-name="reviewed-controls"
-                _in-json-name="reviewed-controls"
                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
@@ -598,17 +369,7 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-objective" -->
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="include-objective"
-                _key="include-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="include-objective"
-                _in-xml-name="include-objective"
-                _in-json-name="include-objectives"
                 gi="include-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
@@ -617,17 +378,7 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="exclude-objective" -->
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="exclude-objective"
-                _key="exclude-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="exclude-objective"
-                _in-xml-name="exclude-objective"
-                _in-json-name="exclude-objectives"
                 gi="exclude-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
@@ -635,18 +386,8 @@
    <xsl:template match="j:map[@key='related-controls']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="related-controls" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/related-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="related-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="related-controls"
-                _in-xml-name="related-controls"
-                _in-json-name="related-controls"
                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
@@ -662,18 +403,7 @@
    <xsl:template match="j:array[@key='assessment-subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="assessment-subject"
-                _key="assessment-subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="assessment-subject"
-                _in-xml-name="assessment-subject"
-                _in-json-name="assessment-subjects"
-                gi="assessment-subject">
+      <assembly name="assessment-subject" gi="assessment-subject">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -687,18 +417,7 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="include-subject"
-                _key="include-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="include-subject"
-                _in-xml-name="include-subject"
-                _in-json-name="include-subjects"
-                gi="include-subject">
+      <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -709,18 +428,7 @@
    <xsl:template match="j:array[@key='exclude-subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="exclude-subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="exclude-subject"
-                _key="exclude-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="exclude-subject"
-                _in-xml-name="exclude-subject"
-                _in-json-name="exclude-subjects"
-                gi="exclude-subject">
+      <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -731,18 +439,8 @@
    <xsl:template match="j:map[@key='assessment-assets']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-assets" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
-                name="assessment-assets"
+      <assembly name="assessment-assets"
                 key="assessment-assets"
-                _base-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"
-                _key-ref="oscal-assessment-common:assessment-assets"
-                _using-name="assessment-assets"
-                _in-xml-name="assessment-assets"
-                _in-json-name="assessment-assets"
                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
@@ -754,18 +452,7 @@
    <xsl:template match="j:array[@key='tasks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="task" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="task"
-                _in-xml-name="task"
-                _in-json-name="tasks"
-                gi="task">
+      <assembly name="task" gi="task">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -784,18 +471,7 @@
    <xsl:template match="j:array[@key='subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -809,19 +485,7 @@
    <xsl:template match="j:map[@key='back-matter']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="back-matter" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -831,21 +495,11 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -864,19 +518,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -892,19 +536,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -920,19 +554,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/role-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="role-id"
-             _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"
-             _key-ref="oscal-metadata:role-id"
-             _using-name="role-id"
-             _in-xml-name="role-id"
-             _in-json-name="role-ids"
              gi="role-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -948,19 +572,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/functions-performed"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="function-performed"
-             _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"
-             _key-ref="oscal-implementation-common:function-performed"
-             _using-name="function-performed"
-             _in-xml-name="function-performed"
-             _in-json-name="functions-performed"
              gi="function-performed"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -976,20 +590,7 @@
    <xsl:template match="j:array[@key='hashes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="hash" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="*[@key='algorithm']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
@@ -1003,15 +604,8 @@
    <xsl:template match="j:map[@key='assessment-plan']/j:string[@key='uuid']"><!-- XML match="assessment-plan/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/uuid"
-            _metaschema-json-id="/assembly/oscal-ap/assessment-plan/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1022,15 +616,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"><!-- XML match="prop/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1041,15 +628,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1058,18 +638,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"><!-- XML match="prop/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1079,15 +648,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"><!-- XML match="prop/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -1098,15 +660,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"><!-- XML match="prop/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1117,15 +672,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"><!-- XML match="link/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1136,15 +684,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"><!-- XML match="link/@rel" -->
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -1155,18 +696,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1178,15 +709,8 @@
                  priority="6"><!-- XML match="assessment-plan/metadata/document-id/@scheme | assessment-plan/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1195,18 +719,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"><!-- XML match="role/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1216,15 +729,8 @@
    <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"><!-- XML match="location/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1235,18 +741,8 @@
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="assessment-plan/metadata/location/address/@type | assessment-plan/metadata/party/address/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1258,15 +754,8 @@
                  priority="8"><!-- XML match="assessment-plan/metadata/location/telephone-number/@type | assessment-plan/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1277,15 +766,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"><!-- XML match="party/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1296,15 +778,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"><!-- XML match="party/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1316,15 +791,8 @@
                  priority="8"><!-- XML match="assessment-plan/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1335,15 +803,8 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1354,15 +815,8 @@
    <xsl:template match="j:map[@key='import-ssp']/j:string[@key='href']"><!-- XML match="import-ssp/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/import-ssp/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/import-ssp/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1373,15 +827,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1392,18 +839,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/type"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:system-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-implementation-common:system-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1415,15 +852,8 @@
                  priority="7"><!-- XML match="assessment-plan/local-definitions/component/status/@state | assessment-plan/assessment-assets/component/status/@state" -->
       <flag in-json="string"
             as-type="token"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -1434,15 +864,8 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1453,15 +876,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1472,15 +888,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1491,15 +900,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -1510,15 +912,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -1529,15 +924,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -1548,15 +936,8 @@
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"><!-- XML match="inventory-item/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1568,15 +949,8 @@
                  priority="8"><!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1587,15 +961,8 @@
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']"><!-- XML match="user/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-user/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1606,18 +973,8 @@
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:string[@key='control-id']"><!-- XML match="objectives-and-methods/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1626,18 +983,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']"><!-- XML match="part/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1647,15 +993,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"><!-- XML match="part/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/name"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1664,18 +1003,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"><!-- XML match="part/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/ns"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1685,15 +1013,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"><!-- XML match="part/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1704,15 +1025,8 @@
    <xsl:template match="j:array[@key='activities']/j:map/j:string[@key='uuid']"><!-- XML match="activity/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1724,15 +1038,8 @@
                  priority="8"><!-- XML match="assessment-plan/local-definitions/activity/step/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1743,18 +1050,8 @@
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id']"><!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-plan/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/reviewed-controls/control-selection/exclude-control/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1765,18 +1062,8 @@
    <xsl:template match="j:array[@key='include-objectives']/j:map/j:string[@key='objective-id'] | j:array[@key='exclude-objectives']/j:map/j:string[@key='objective-id']"><!-- XML match="include-objective/@objective-id | exclude-objective/@objective-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:objective-id"
-            _step="objective-id"
-            _key="objective-id"
-            _key-ref="oscal-assessment-common:objective-id"
-            _using-name="objective-id"
-            _in-xml-name="objective-id"
-            _in-json-name="objective-id"
             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1787,15 +1074,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='uuid']"><!-- XML match="part/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1806,15 +1086,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"><!-- XML match="part/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1823,18 +1096,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"><!-- XML match="part/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1844,15 +1106,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"><!-- XML match="part/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/class"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1863,15 +1118,8 @@
    <xsl:template match="j:array[@key='assessment-subjects']/j:map/j:string[@key='type'] | j:array[@key='subjects']/j:map/j:string[@key='type']"><!-- XML match="assessment-subject/@type | subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1882,18 +1130,8 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="include-subject/@subject-uuid | exclude-subject/@subject-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1904,18 +1142,8 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"><!-- XML match="include-subject/@type | exclude-subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1927,15 +1155,8 @@
                  priority="6"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1947,15 +1168,8 @@
                  priority="8"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1966,15 +1180,8 @@
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid']"><!-- XML match="task/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1985,15 +1192,8 @@
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type']"><!-- XML match="task/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2005,15 +1205,8 @@
                  priority="8"><!-- XML match="assessment-plan//task/timing/on-date/@date" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="date"
-            _key="date"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
             name="date"
             key="date"
-            _using-name="date"
-            _in-xml-name="date"
-            _in-json-name="date"
             gi="date">
          <xsl:value-of select="."/>
       </flag>
@@ -2025,15 +1218,8 @@
                  priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@start" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -2045,15 +1231,8 @@
                  priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@end" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -2065,15 +1244,8 @@
                  priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@period" -->
       <flag in-json="number"
             as-type="positiveInteger"
-            _step="period"
-            _key="period"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
             name="period"
             key="period"
-            _using-name="period"
-            _in-xml-name="period"
-            _in-json-name="period"
             gi="period">
          <xsl:value-of select="."/>
       </flag>
@@ -2085,15 +1257,8 @@
                  priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@unit" -->
       <flag in-json="string"
             as-type="string"
-            _step="unit"
-            _key="unit"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
             name="unit"
             key="unit"
-            _using-name="unit"
-            _in-xml-name="unit"
-            _in-json-name="unit"
             gi="unit">
          <xsl:value-of select="."/>
       </flag>
@@ -2105,15 +1270,8 @@
                  priority="7"><!-- XML match="assessment-plan//task/dependency/@task-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2125,15 +1283,8 @@
                  priority="7"><!-- XML match="assessment-plan//task/associated-activity/@activity-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="activity-uuid"
-            _key="activity-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/activity-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/activity-uuid"
             name="activity-uuid"
             key="activity-uuid"
-            _using-name="activity-uuid"
-            _in-xml-name="activity-uuid"
-            _in-json-name="activity-uuid"
             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2145,15 +1296,8 @@
                  priority="6"><!-- XML match="assessment-plan/back-matter/resource/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2165,15 +1309,8 @@
                  priority="8"><!-- XML match="assessment-plan/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2184,18 +1321,8 @@
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="assessment-plan/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2206,15 +1333,8 @@
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -2226,15 +1346,8 @@
                  priority="7"><!-- XML match="assessment-plan/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -2245,18 +1358,8 @@
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="assessment-plan/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2268,17 +1371,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2298,20 +1394,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2331,20 +1417,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2364,20 +1440,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2397,20 +1463,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2430,18 +1486,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -2460,10 +1505,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -2474,17 +1516,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2504,20 +1539,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2537,20 +1562,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2570,20 +1585,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2603,20 +1608,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2636,17 +1631,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2666,19 +1654,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2695,17 +1673,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2725,17 +1696,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2755,17 +1719,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2785,18 +1742,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2816,17 +1766,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2846,17 +1789,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2876,19 +1812,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -2904,19 +1828,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2933,17 +1847,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2963,17 +1870,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2993,17 +1893,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3023,17 +1916,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3053,19 +1939,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3082,19 +1958,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3111,16 +1977,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3137,17 +1996,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3167,17 +2019,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3197,17 +2042,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3227,16 +2065,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3253,17 +2084,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3283,19 +2107,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3312,19 +2126,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3341,18 +2145,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -3365,19 +2158,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3394,17 +2177,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3424,17 +2200,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3454,17 +2223,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3484,17 +2246,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3514,16 +2269,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3540,17 +2288,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3570,15 +2311,8 @@
                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions" -->
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -3595,17 +2329,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3625,18 +2352,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3656,17 +2376,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3686,17 +2399,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3716,16 +2422,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -3737,17 +2434,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3767,17 +2457,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3797,18 +2480,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3828,17 +2504,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3858,17 +2527,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3888,15 +2550,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component" -->
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -3908,17 +2562,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3938,17 +2585,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3968,17 +2608,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3998,17 +2631,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4028,18 +2654,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4059,17 +2678,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4089,17 +2701,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/authorized-privilege/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4119,18 +2724,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/authorized-privilege/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4150,18 +2748,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4181,17 +2772,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4211,17 +2795,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4241,9 +2818,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -4254,7 +2831,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -4265,17 +2842,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4295,17 +2865,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4325,18 +2888,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4356,17 +2912,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4386,15 +2935,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step" -->
-      <assembly _step="step"
-                _key="steps"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps"
-                name="step"
-                _using-name="step"
-                _in-xml-name="step"
-                _in-json-name="steps"
-                gi="step">
+      <assembly name="step" gi="step">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -4409,17 +2950,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4439,18 +2973,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4470,17 +2997,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4500,18 +3020,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4531,17 +3044,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4561,15 +3067,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -4583,18 +3081,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4614,17 +3105,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4645,15 +3129,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -4664,18 +3141,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -4684,16 +3150,9 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4710,18 +3169,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -4730,16 +3178,9 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4756,15 +3197,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -4778,18 +3211,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4809,17 +3235,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4840,15 +3259,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -4859,17 +3271,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4889,18 +3294,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4920,17 +3318,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4950,15 +3341,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -4972,18 +3355,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5003,17 +3379,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5034,15 +3403,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5053,18 +3415,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -5073,16 +3424,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -5099,18 +3443,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -5119,16 +3452,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -5145,15 +3471,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -5167,18 +3485,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5198,17 +3509,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5229,15 +3533,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5248,17 +3545,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5278,15 +3568,8 @@
                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/terms-and-conditions" -->
-      <assembly _step="terms-and-conditions"
-                _key="terms-and-conditions"
-                _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions"
-                name="terms-and-conditions"
+      <assembly name="terms-and-conditions"
                 key="terms-and-conditions"
-                _using-name="terms-and-conditions"
-                _in-xml-name="terms-and-conditions"
-                _in-json-name="terms-and-conditions"
                 gi="terms-and-conditions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">terms-and-conditions</xsl:attribute>
@@ -5298,17 +3581,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/terms-and-conditions//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5328,9 +3604,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -5341,7 +3617,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -5352,17 +3628,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/terms-and-conditions//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5382,18 +3651,11 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5413,17 +3675,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5443,15 +3698,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -5465,18 +3712,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5496,17 +3736,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5527,15 +3760,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5546,18 +3772,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -5566,16 +3781,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -5592,18 +3800,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -5612,16 +3809,9 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -5638,15 +3828,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -5660,18 +3842,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5691,17 +3866,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5722,15 +3890,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5741,18 +3902,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5772,17 +3926,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5803,15 +3950,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5822,17 +3962,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5852,17 +3985,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5882,17 +4008,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5912,18 +4031,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5943,17 +4055,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5973,17 +4078,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6003,16 +4101,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -6024,17 +4113,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6054,17 +4136,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6084,15 +4159,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform" -->
-      <assembly _step="assessment-platform"
-                _key="assessment-platforms"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms"
-                name="assessment-platform"
-                _using-name="assessment-platform"
-                _in-xml-name="assessment-platform"
-                _in-json-name="assessment-platforms"
-                gi="assessment-platform">
+      <assembly name="assessment-platform" gi="assessment-platform">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -6105,17 +4172,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6135,17 +4195,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6165,15 +4218,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component" -->
-      <assembly _step="uses-component"
-                _key="uses-components"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components"
-                name="uses-component"
-                _using-name="uses-component"
-                _in-xml-name="uses-component"
-                _in-json-name="uses-components"
-                gi="uses-component">
+      <assembly name="uses-component" gi="uses-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -6185,17 +4230,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6215,17 +4253,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6245,17 +4276,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6275,18 +4299,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6306,17 +4323,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6336,16 +4346,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing" -->
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -6358,17 +4359,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing/on-date" -->
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -6380,15 +4371,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing/within-date-range" -->
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -6402,15 +4386,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing/at-frequency" -->
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -6423,15 +4400,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/dependency" -->
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -6440,15 +4409,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity" -->
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="*[@key='activity-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -6461,17 +4422,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6491,17 +4445,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6521,18 +4468,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6552,17 +4492,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6583,15 +4516,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -6602,17 +4528,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6632,17 +4551,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6662,18 +4574,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6693,17 +4598,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6724,15 +4622,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -6743,17 +4634,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6773,17 +4657,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6803,17 +4680,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6833,15 +4703,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -6857,17 +4719,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6887,18 +4742,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6918,19 +4766,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6947,16 +4785,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -6969,17 +4798,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6999,17 +4821,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7029,15 +4844,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -7047,17 +4854,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -7111,11 +4911,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 b7989aab98..250592edac 100644
--- a/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
@@ -74,13 +74,8 @@
    <xsl:template match="j:map[@key='assessment-results']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results"
-                _metaschema-json-id="/assembly/oscal-ar/assessment-results"
-                name="assessment-results"
+      <assembly name="assessment-results"
                 key="assessment-results"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-results</xsl:attribute>
@@ -99,19 +94,7 @@
    <xsl:template match="j:map[@key='metadata']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="metadata" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -134,18 +117,7 @@
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="prop" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -157,18 +129,7 @@
    <xsl:template match="j:array[@key='links']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="link" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
@@ -178,18 +139,7 @@
    <xsl:template match="j:array[@key='roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -202,18 +152,7 @@
    <xsl:template match="j:array[@key='locations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='address']"/>
@@ -228,18 +167,7 @@
    <xsl:template match="j:array[@key='parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='name']"/>
@@ -258,18 +186,7 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -280,19 +197,7 @@
    <xsl:template match="j:map[@key='import-ap']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-ap" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/import-ap"
-                _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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:import-ap"
-                _step="import-ap"
-                _key="import-ap"
-                _key-ref="oscal-ar:import-ap"
-                _using-name="import-ap"
-                _in-xml-name="import-ap"
-                _in-json-name="import-ap"
-                gi="import-ap">
+      <assembly name="import-ap" key="import-ap" gi="import-ap">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-ap</xsl:attribute>
          </xsl:if>
@@ -303,18 +208,7 @@
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="objectives-and-methods" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:local-objective"
-                _step="objectives-and-methods"
-                _key="objectives-and-methods"
-                _key-ref="oscal-assessment-common:local-objective"
-                _using-name="objectives-and-methods"
-                _in-xml-name="objectives-and-methods"
-                _in-json-name="objectives-and-methods"
-                gi="objectives-and-methods">
+      <assembly name="local-objective" gi="objectives-and-methods">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -326,18 +220,7 @@
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:array[@key='parts']/j:map | j:array[@key='objectives-and-methods']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="objectives-and-methods/part | objectives-and-methods/part//part" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-catalog-common:part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="part" gi="part">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -352,18 +235,7 @@
    <xsl:template match="j:array[@key='attestations']/j:map/j:array[@key='parts']/j:map | j:array[@key='attestations']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="attestation/part | attestation/part//part" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-assessment-common:assessment-part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="assessment-part" gi="part">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -378,18 +250,7 @@
    <xsl:template match="j:array[@key='activities']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="activity" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:activity"
-                _step="activity"
-                _key="activities"
-                _key-ref="oscal-assessment-common:activity"
-                _using-name="activity"
-                _in-xml-name="activity"
-                _in-json-name="activities"
-                gi="activity">
+      <assembly name="activity" gi="activity">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -404,18 +265,8 @@
    <xsl:template match="j:map[@key='reviewed-controls']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="reviewed-controls" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/reviewed-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="reviewed-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="reviewed-controls"
-                _in-xml-name="reviewed-controls"
-                _in-json-name="reviewed-controls"
                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
@@ -432,17 +283,7 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-objective" -->
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="include-objective"
-                _key="include-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="include-objective"
-                _in-xml-name="include-objective"
-                _in-json-name="include-objectives"
                 gi="include-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
@@ -451,17 +292,7 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="exclude-objective" -->
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="exclude-objective"
-                _key="exclude-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="exclude-objective"
-                _in-xml-name="exclude-objective"
-                _in-json-name="exclude-objectives"
                 gi="exclude-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
@@ -469,18 +300,7 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -491,18 +311,8 @@
    <xsl:template match="j:map[@key='related-controls']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="related-controls" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/related-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="related-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="related-controls"
-                _in-xml-name="related-controls"
-                _in-json-name="related-controls"
                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
@@ -518,18 +328,7 @@
    <xsl:template match="j:array[@key='results']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="result" -->
-      <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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:result"
-                _step="result"
-                _key="results"
-                _key-ref="oscal-ar:result"
-                _using-name="result"
-                _in-xml-name="result"
-                _in-json-name="results"
-                gi="result">
+      <assembly name="result" gi="result">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -550,18 +349,7 @@
    <xsl:template match="j:array[@key='components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-implementation-common:system-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="system-component" gi="component">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -578,18 +366,7 @@
    <xsl:template match="j:array[@key='protocols']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="protocol" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -599,19 +376,7 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="port-range" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="*[@key='start']"/>
          <xsl:apply-templates select="*[@key='end']"/>
          <xsl:apply-templates select="*[@key='transport']"/>
@@ -620,18 +385,7 @@
    <xsl:template match="j:array[@key='inventory-items']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="inventory-item" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:inventory-item"
-                _step="inventory-item"
-                _key="inventory-items"
-                _key-ref="oscal-implementation-common:inventory-item"
-                _using-name="inventory-item"
-                _in-xml-name="inventory-item"
-                _in-json-name="inventory-items"
-                gi="inventory-item">
+      <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -644,18 +398,7 @@
    <xsl:template match="j:array[@key='users']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="user" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-user"
-                _step="user"
-                _key="users"
-                _key-ref="oscal-implementation-common:system-user"
-                _using-name="user"
-                _in-xml-name="user"
-                _in-json-name="users"
-                gi="user">
+      <assembly name="system-user" gi="user">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -670,18 +413,7 @@
    <xsl:template match="j:array[@key='authorized-privileges']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="authorized-privilege" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:authorized-privilege"
-                _step="authorized-privilege"
-                _key="authorized-privileges"
-                _key-ref="oscal-implementation-common:authorized-privilege"
-                _using-name="authorized-privilege"
-                _in-xml-name="authorized-privilege"
-                _in-json-name="authorized-privileges"
-                gi="authorized-privilege">
+      <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='functions-performed']"/>
@@ -690,18 +422,8 @@
    <xsl:template match="j:map[@key='assessment-assets']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-assets" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/assessment-assets"
-                _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/assessment-assets"
-                name="assessment-assets"
+      <assembly name="assessment-assets"
                 key="assessment-assets"
-                _base-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"
-                _key-ref="oscal-assessment-common:assessment-assets"
-                _using-name="assessment-assets"
-                _in-xml-name="assessment-assets"
-                _in-json-name="assessment-assets"
                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
@@ -713,18 +435,7 @@
    <xsl:template match="j:array[@key='tasks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-task" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="assessment-task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="assessment-task"
-                _in-xml-name="assessment-task"
-                _in-json-name="tasks"
-                gi="assessment-task">
+      <assembly name="task" gi="assessment-task">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -743,19 +454,7 @@
    <xsl:template match="j:array[@key='tasks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="task" -->
-      <assembly recursive="true"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="task"
-                _in-xml-name="task"
-                _in-json-name="tasks"
-                gi="task">
+      <assembly recursive="true" name="task" gi="task">
          <xsl:apply-templates select="*"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
@@ -776,18 +475,7 @@
    <xsl:template match="j:array[@key='subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -801,18 +489,7 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="include-subject"
-                _key="include-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="include-subject"
-                _in-xml-name="include-subject"
-                _in-json-name="include-subjects"
-                gi="include-subject">
+      <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -823,18 +500,7 @@
    <xsl:template match="j:array[@key='exclude-subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="exclude-subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="exclude-subject"
-                _key="exclude-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="exclude-subject"
-                _in-xml-name="exclude-subject"
-                _in-json-name="exclude-subjects"
-                gi="exclude-subject">
+      <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -845,19 +511,7 @@
    <xsl:template match="j:array[@key='logged-by']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="logged-by" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:logged-by"
-                _step="logged-by"
-                _key="logged-by"
-                _key-ref="oscal-assessment-common:logged-by"
-                _using-name="logged-by"
-                _in-xml-name="logged-by"
-                _in-json-name="logged-by"
-                gi="logged-by">
+      <assembly as-type="empty" name="logged-by" gi="logged-by">
          <xsl:apply-templates select="*[@key='party-uuid']"/>
          <xsl:apply-templates select="*[@key='role-id']"/>
       </assembly>
@@ -865,18 +519,7 @@
    <xsl:template match="j:array[@key='related-tasks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="related-task" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:related-task"
-                _step="related-task"
-                _key="related-tasks"
-                _key-ref="oscal-assessment-common:related-task"
-                _using-name="related-task"
-                _in-xml-name="related-task"
-                _in-json-name="related-tasks"
-                gi="related-task">
+      <assembly name="related-task" gi="related-task">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -889,18 +532,7 @@
    <xsl:template match="j:array[@key='observations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="observation" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:observation"
-                _step="observation"
-                _key="observations"
-                _key-ref="oscal-assessment-common:observation"
-                _using-name="observation"
-                _in-xml-name="observation"
-                _in-json-name="observations"
-                gi="observation">
+      <assembly name="observation" gi="observation">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -919,18 +551,7 @@
    <xsl:template match="(j:array[@key='origins']/j:map | j:array[@key='origins']/j:map | j:map[@key='origin'] | j:array[@key='origins']/j:map | j:array[@key='origins']/j:map)">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="origin" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin"
-                _step="origin"
-                _key="origins"
-                _key-ref="oscal-assessment-common:origin"
-                _using-name="origin"
-                _in-xml-name="origin"
-                _in-json-name="origins"
-                gi="origin">
+      <assembly name="origin" gi="origin">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">origin</xsl:attribute>
          </xsl:if>
@@ -941,18 +562,7 @@
    <xsl:template match="j:array[@key='actors']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="actor" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin-actor"
-                _step="actor"
-                _key="actors"
-                _key-ref="oscal-assessment-common:origin-actor"
-                _using-name="actor"
-                _in-xml-name="actor"
-                _in-json-name="actors"
-                gi="actor">
+      <assembly name="origin-actor" gi="actor">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='actor-uuid']"/>
          <xsl:apply-templates select="*[@key='role-id']"/>
@@ -963,18 +573,7 @@
    <xsl:template match="j:array[@key='risks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="risk" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:risk"
-                _step="risk"
-                _key="risks"
-                _key-ref="oscal-assessment-common:risk"
-                _using-name="risk"
-                _in-xml-name="risk"
-                _in-json-name="risks"
-                gi="risk">
+      <assembly name="risk" gi="risk">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -995,18 +594,7 @@
    <xsl:template match="j:array[@key='characterizations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="characterization" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:characterization"
-                _step="characterization"
-                _key="characterizations"
-                _key-ref="oscal-assessment-common:characterization"
-                _using-name="characterization"
-                _in-xml-name="characterization"
-                _in-json-name="characterizations"
-                gi="characterization">
+      <assembly name="characterization" gi="characterization">
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='origin']"/>
@@ -1016,18 +604,7 @@
    <xsl:template match="j:array[@key='findings']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="finding" -->
-      <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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:finding"
-                _step="finding"
-                _key="findings"
-                _key-ref="oscal-ar:finding"
-                _using-name="finding"
-                _in-xml-name="finding"
-                _in-json-name="findings"
-                gi="finding">
+      <assembly name="finding" gi="finding">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -1044,19 +621,7 @@
    <xsl:template match="j:map[@key='target']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="target" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/finding/target"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:finding-target"
-                _step="target"
-                _key="target"
-                _key-ref="oscal-assessment-common:finding-target"
-                _using-name="target"
-                _in-xml-name="target"
-                _in-json-name="target"
-                gi="target">
+      <assembly name="finding-target" key="target" gi="target">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">target</xsl:attribute>
          </xsl:if>
@@ -1074,18 +639,8 @@
    <xsl:template match="j:map[@key='implementation-status']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="implementation-status" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/implementation-status"
-                _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/implementation-status"
-                name="implementation-status"
+      <assembly name="implementation-status"
                 key="implementation-status"
-                _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"
-                _key-ref="oscal-implementation-common:implementation-status"
-                _using-name="implementation-status"
-                _in-xml-name="implementation-status"
-                _in-json-name="implementation-status"
                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
@@ -1097,19 +652,7 @@
    <xsl:template match="j:map[@key='back-matter']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="back-matter" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -1119,21 +662,11 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1152,19 +685,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -1180,19 +703,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -1208,19 +721,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/role-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="role-id"
-             _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"
-             _key-ref="oscal-metadata:role-id"
-             _using-name="role-id"
-             _in-xml-name="role-id"
-             _in-json-name="role-ids"
              gi="role-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -1236,19 +739,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/functions-performed"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="function-performed"
-             _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"
-             _key-ref="oscal-implementation-common:function-performed"
-             _using-name="function-performed"
-             _in-xml-name="function-performed"
-             _in-json-name="functions-performed"
              gi="function-performed"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -1264,20 +757,7 @@
    <xsl:template match="j:array[@key='threat-ids']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="threat-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/threat-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/threat-ids"
-             collapsible="no"
-             as-type="uri"
-             name="threat-id"
-             _base-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"
-             _key-ref="oscal-assessment-common:threat-id"
-             _using-name="threat-id"
-             _in-xml-name="threat-id"
-             _in-json-name="threat-ids"
-             gi="threat-id">
+      <field collapsible="no" as-type="uri" name="threat-id" gi="threat-id">
          <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -1292,20 +772,10 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/status-change"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-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"
-             _key-ref="oscal-assessment-common:risk-status"
-             _using-name="status-change"
-             _in-xml-name="status-change"
-             _in-json-name="status-change"
              gi="status-change"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1324,20 +794,7 @@
    <xsl:template match="j:array[@key='hashes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="hash" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="*[@key='algorithm']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
@@ -1351,15 +808,8 @@
    <xsl:template match="j:map[@key='assessment-results']/j:string[@key='uuid']"><!-- XML match="assessment-results/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/assessment-results/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/assessment-results/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1370,15 +820,8 @@
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)/j:string[@key='name']"><!-- XML match="prop/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1389,15 +832,8 @@
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)/j:string[@key='uuid']"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1406,18 +842,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)/j:string[@key='ns']"><!-- XML match="prop/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1427,15 +852,8 @@
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)/j:string[@key='value']"><!-- XML match="prop/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -1446,15 +864,8 @@
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)/j:string[@key='class']"><!-- XML match="prop/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1465,15 +876,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"><!-- XML match="link/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1484,15 +888,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"><!-- XML match="link/@rel" -->
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -1503,18 +900,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1526,15 +913,8 @@
                  priority="6"><!-- XML match="assessment-results/metadata/document-id/@scheme | assessment-results/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1543,18 +923,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"><!-- XML match="role/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1564,15 +933,8 @@
    <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"><!-- XML match="location/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1583,18 +945,8 @@
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="assessment-results/metadata/location/address/@type | assessment-results/metadata/party/address/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1606,15 +958,8 @@
                  priority="8"><!-- XML match="assessment-results/metadata/location/telephone-number/@type | assessment-results/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1625,15 +970,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"><!-- XML match="party/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1644,15 +982,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"><!-- XML match="party/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1664,15 +995,8 @@
                  priority="8"><!-- XML match="assessment-results/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1683,15 +1007,8 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1702,15 +1019,8 @@
    <xsl:template match="j:map[@key='import-ap']/j:string[@key='href']"><!-- XML match="import-ap/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-ar/import-ap/href"
-            _metaschema-json-id="/assembly/oscal-ar/import-ap/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1721,18 +1031,8 @@
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:string[@key='control-id']"><!-- XML match="objectives-and-methods/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1741,18 +1041,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']"><!-- XML match="part/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1762,15 +1051,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"><!-- XML match="part/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/name"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1779,18 +1061,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"><!-- XML match="part/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/ns"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1800,15 +1071,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"><!-- XML match="part/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1819,15 +1083,8 @@
    <xsl:template match="j:array[@key='activities']/j:map/j:string[@key='uuid']"><!-- XML match="activity/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1839,15 +1096,8 @@
                  priority="8"><!-- XML match="assessment-results/local-definitions/activity/step/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1858,18 +1108,8 @@
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id']"><!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-results/result/reviewed-controls/control-selection/include-control/@control-id | assessment-results/result/reviewed-controls/control-selection/exclude-control/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1880,18 +1120,8 @@
    <xsl:template match="j:array[@key='include-objectives']/j:map/j:string[@key='objective-id'] | j:array[@key='exclude-objectives']/j:map/j:string[@key='objective-id']"><!-- XML match="include-objective/@objective-id | exclude-objective/@objective-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:objective-id"
-            _step="objective-id"
-            _key="objective-id"
-            _key-ref="oscal-assessment-common:objective-id"
-            _using-name="objective-id"
-            _in-xml-name="objective-id"
-            _in-json-name="objective-id"
             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1902,15 +1132,8 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1921,15 +1144,8 @@
    <xsl:template match="j:array[@key='results']/j:map/j:string[@key='uuid']"><!-- XML match="result/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/result/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/result/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1940,15 +1156,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1959,18 +1168,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/type"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:system-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-implementation-common:system-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1982,15 +1181,8 @@
                  priority="9"><!-- XML match="assessment-results/result/local-definitions/component/status/@state | assessment-results/result/local-definitions/assessment-assets/component/status/@state" -->
       <flag in-json="string"
             as-type="token"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -2001,15 +1193,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2020,15 +1205,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -2039,15 +1217,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -2058,15 +1229,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -2077,15 +1241,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -2096,15 +1253,8 @@
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"><!-- XML match="inventory-item/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2116,15 +1266,8 @@
                  priority="10"><!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2135,15 +1278,8 @@
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']"><!-- XML match="user/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-user/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2155,15 +1291,8 @@
                  priority="9"><!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2175,15 +1304,8 @@
                  priority="11"><!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2194,15 +1316,8 @@
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid'] | j:array[@key='tasks']/j:map/j:string[@key='uuid']"><!-- XML match="assessment-task/@uuid | task/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2213,15 +1328,8 @@
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type'] | j:array[@key='tasks']/j:map/j:string[@key='type']"><!-- XML match="assessment-task/@type | task/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2233,15 +1341,8 @@
                  priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/on-date/@date | assessment-results/result/risk/response//task/timing/on-date/@date" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="date"
-            _key="date"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
             name="date"
             key="date"
-            _using-name="date"
-            _in-xml-name="date"
-            _in-json-name="date"
             gi="date">
          <xsl:value-of select="."/>
       </flag>
@@ -2253,15 +1354,8 @@
                  priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@start | assessment-results/result/risk/response//task/timing/within-date-range/@start" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -2273,15 +1367,8 @@
                  priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@end | assessment-results/result/risk/response//task/timing/within-date-range/@end" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -2293,15 +1380,8 @@
                  priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@period | assessment-results/result/risk/response//task/timing/at-frequency/@period" -->
       <flag in-json="number"
             as-type="positiveInteger"
-            _step="period"
-            _key="period"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
             name="period"
             key="period"
-            _using-name="period"
-            _in-xml-name="period"
-            _in-json-name="period"
             gi="period">
          <xsl:value-of select="."/>
       </flag>
@@ -2313,15 +1393,8 @@
                  priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@unit | assessment-results/result/risk/response//task/timing/at-frequency/@unit" -->
       <flag in-json="string"
             as-type="string"
-            _step="unit"
-            _key="unit"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
             name="unit"
             key="unit"
-            _using-name="unit"
-            _in-xml-name="unit"
-            _in-json-name="unit"
             gi="unit">
          <xsl:value-of select="."/>
       </flag>
@@ -2333,15 +1406,8 @@
                  priority="10"><!-- XML match="assessment-results/result/local-definitions//assessment-task/dependency/@task-uuid | assessment-results/result/risk/response//task/dependency/@task-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2353,15 +1419,8 @@
                  priority="10"><!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/@activity-uuid | assessment-results/result/risk/response//task/associated-activity/@activity-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="activity-uuid"
-            _key="activity-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/activity-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/activity-uuid"
             name="activity-uuid"
             key="activity-uuid"
-            _using-name="activity-uuid"
-            _in-xml-name="activity-uuid"
-            _in-json-name="activity-uuid"
             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2372,15 +1431,8 @@
    <xsl:template match="j:array[@key='subjects']/j:map/j:string[@key='type']"><!-- XML match="subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2391,18 +1443,8 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="include-subject/@subject-uuid | exclude-subject/@subject-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2413,18 +1455,8 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"><!-- XML match="include-subject/@type | exclude-subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2435,15 +1467,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='uuid']"><!-- XML match="part/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2454,15 +1479,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"><!-- XML match="part/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -2471,18 +1489,7 @@
                  mode="keep-value-property"
                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"><!-- XML match="part/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2492,15 +1499,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"><!-- XML match="part/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/class"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -2512,15 +1512,8 @@
                  priority="8"><!-- XML match="assessment-results/result/assessment-log/entry/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2531,15 +1524,8 @@
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='party-uuid']"><!-- XML match="logged-by/@party-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="party-uuid"
-            _key="party-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
             name="party-uuid"
             key="party-uuid"
-            _using-name="party-uuid"
-            _in-xml-name="party-uuid"
-            _in-json-name="party-uuid"
             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2550,15 +1536,8 @@
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='role-id']"><!-- XML match="logged-by/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2569,15 +1548,8 @@
    <xsl:template match="j:array[@key='related-tasks']/j:map/j:string[@key='task-uuid']"><!-- XML match="related-task/@task-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2589,15 +1561,8 @@
                  priority="11"><!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/finding/origin/related-task/identified-subject/@subject-placeholder-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="subject-placeholder-uuid"
-            _key="subject-placeholder-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
             name="subject-placeholder-uuid"
             key="subject-placeholder-uuid"
-            _using-name="subject-placeholder-uuid"
-            _in-xml-name="subject-placeholder-uuid"
-            _in-json-name="subject-placeholder-uuid"
             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2608,15 +1573,8 @@
    <xsl:template match="j:array[@key='observations']/j:map/j:string[@key='uuid']"><!-- XML match="observation/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2627,15 +1585,8 @@
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='type']"><!-- XML match="actor/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2646,15 +1597,8 @@
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='actor-uuid']"><!-- XML match="actor/@actor-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="actor-uuid"
-            _key="actor-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
             name="actor-uuid"
             key="actor-uuid"
-            _using-name="actor-uuid"
-            _in-xml-name="actor-uuid"
-            _in-json-name="actor-uuid"
             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2665,15 +1609,8 @@
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='role-id']"><!-- XML match="actor/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2684,18 +1621,8 @@
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="assessment-results/result/observation/subject/@subject-uuid | assessment-results/result/risk/mitigating-factor/subject/@subject-uuid | assessment-results/result/risk/response/required-asset/subject/@subject-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2706,18 +1633,8 @@
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type']"><!-- XML match="assessment-results/result/observation/subject/@type | assessment-results/result/risk/mitigating-factor/subject/@type | assessment-results/result/risk/response/required-asset/subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2729,15 +1646,8 @@
                  priority="9"><!-- XML match="assessment-results/result/observation/relevant-evidence/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2748,15 +1658,8 @@
    <xsl:template match="j:array[@key='risks']/j:map/j:string[@key='uuid']"><!-- XML match="risk/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2767,15 +1670,8 @@
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='system']"><!-- XML match="threat-id/@system" -->
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/system"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -2786,15 +1682,8 @@
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='href']"><!-- XML match="threat-id/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/href"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2806,15 +1695,8 @@
                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -2826,15 +1708,8 @@
                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@system" -->
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/system"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -2846,15 +1721,8 @@
                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/value"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -2866,15 +1734,8 @@
                  priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2886,15 +1747,8 @@
                  priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@implementation-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="implementation-uuid"
-            _key="implementation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/implementation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/implementation-uuid"
             name="implementation-uuid"
             key="implementation-uuid"
-            _using-name="implementation-uuid"
-            _in-xml-name="implementation-uuid"
-            _in-json-name="implementation-uuid"
             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2906,15 +1760,8 @@
                  priority="9"><!-- XML match="assessment-results/result/risk/response/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2926,15 +1773,8 @@
                  priority="9"><!-- XML match="assessment-results/result/risk/response/@lifecycle" -->
       <flag in-json="string"
             as-type="token"
-            _step="lifecycle"
-            _key="lifecycle"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/lifecycle"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/lifecycle"
             name="lifecycle"
             key="lifecycle"
-            _using-name="lifecycle"
-            _in-xml-name="lifecycle"
-            _in-json-name="lifecycle"
             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
@@ -2946,15 +1786,8 @@
                  priority="11"><!-- XML match="assessment-results/result/risk/response/required-asset/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2966,15 +1799,8 @@
                  priority="10"><!-- XML match="assessment-results/result/risk/risk-log/entry/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2986,15 +1812,8 @@
                  priority="12"><!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/@response-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="response-uuid"
-            _key="response-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response/response-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses/response-uuid"
             name="response-uuid"
             key="response-uuid"
-            _using-name="response-uuid"
-            _in-xml-name="response-uuid"
-            _in-json-name="response-uuid"
             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3006,15 +1825,8 @@
                  priority="9"><!-- XML match="assessment-results/result/risk/related-observation/@observation-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3025,15 +1837,8 @@
    <xsl:template match="j:array[@key='findings']/j:map/j:string[@key='uuid']"><!-- XML match="finding/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3044,15 +1849,8 @@
    <xsl:template match="j:map[@key='target']/j:string[@key='type']"><!-- XML match="target/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -3063,15 +1861,8 @@
    <xsl:template match="j:map[@key='target']/j:string[@key='target-id']"><!-- XML match="target/@target-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="target-id"
-            _key="target-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/target-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/target-id"
             name="target-id"
             key="target-id"
-            _using-name="target-id"
-            _in-xml-name="target-id"
-            _in-json-name="target-id"
             gi="target-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3083,15 +1874,8 @@
                  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>
@@ -3103,15 +1887,8 @@
                  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>
@@ -3122,15 +1899,8 @@
    <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"><!-- XML match="implementation-status/@state" -->
       <flag in-json="string"
             as-type="token"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/implementation-status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/implementation-status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -3142,15 +1912,8 @@
                  priority="9"><!-- XML match="assessment-results/result/finding/related-observation/@observation-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3162,15 +1925,8 @@
                  priority="9"><!-- XML match="assessment-results/result/finding/associated-risk/@risk-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="risk-uuid"
-            _key="risk-uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/associated-risk/risk-uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/related-risks/risk-uuid"
             name="risk-uuid"
             key="risk-uuid"
-            _using-name="risk-uuid"
-            _in-xml-name="risk-uuid"
-            _in-json-name="risk-uuid"
             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3182,15 +1938,8 @@
                  priority="6"><!-- XML match="assessment-results/back-matter/resource/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3202,15 +1951,8 @@
                  priority="8"><!-- XML match="assessment-results/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -3221,18 +1963,8 @@
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="assessment-results/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -3243,15 +1975,8 @@
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -3263,15 +1988,8 @@
                  priority="7"><!-- XML match="assessment-results/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -3282,18 +2000,8 @@
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="assessment-results/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -3305,17 +2013,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3335,20 +2036,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3368,20 +2059,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3401,20 +2082,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3434,20 +2105,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3467,18 +2128,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -3497,10 +2147,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -3511,17 +2158,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3541,20 +2181,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3574,20 +2204,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3607,20 +2227,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3640,20 +2250,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3673,17 +2273,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3703,19 +2296,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3732,17 +2315,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3762,17 +2338,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3792,17 +2361,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3822,18 +2384,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3853,17 +2408,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3883,17 +2431,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3913,19 +2454,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -3941,19 +2470,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3970,17 +2489,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4000,17 +2512,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4030,17 +2535,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4060,17 +2558,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4090,19 +2581,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4119,19 +2600,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4148,16 +2619,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4174,17 +2638,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4204,17 +2661,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4234,17 +2684,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4264,16 +2707,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4290,17 +2726,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4320,19 +2749,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4349,19 +2768,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4378,18 +2787,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -4402,19 +2800,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4431,17 +2819,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4461,17 +2842,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4491,17 +2865,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4521,17 +2888,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4551,16 +2911,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4577,17 +2930,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4607,15 +2953,8 @@
                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions" -->
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ar/assessment-results/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ar/assessment-results/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -4629,18 +2968,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4660,17 +2992,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4690,17 +3015,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4720,9 +3038,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -4733,7 +3051,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -4744,17 +3062,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4774,17 +3085,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4804,18 +3108,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4835,17 +3132,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4865,15 +3155,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step" -->
-      <assembly _step="step"
-                _key="steps"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps"
-                name="step"
-                _using-name="step"
-                _in-xml-name="step"
-                _in-json-name="steps"
-                gi="step">
+      <assembly name="step" gi="step">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -4888,17 +3170,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4918,18 +3193,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4949,17 +3217,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4979,18 +3240,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5010,17 +3264,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5040,15 +3287,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -5062,18 +3301,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5093,17 +3325,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5124,15 +3349,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5143,18 +3361,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -5163,16 +3370,9 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -5189,18 +3389,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -5209,16 +3398,9 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -5235,15 +3417,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -5257,18 +3431,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5288,17 +3455,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5319,15 +3479,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5338,17 +3491,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5368,18 +3514,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5399,17 +3538,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5429,15 +3561,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -5451,18 +3575,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5482,17 +3599,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5513,15 +3623,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5532,18 +3635,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -5552,16 +3644,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -5578,18 +3663,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -5598,16 +3672,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -5624,15 +3691,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -5646,18 +3705,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5677,17 +3729,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5708,15 +3753,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5727,17 +3765,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5757,17 +3788,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/result/title"
-             _metaschema-json-id="/assembly/oscal-ar/result/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5787,18 +3811,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/result/description"
-             _metaschema-json-id="/assembly/oscal-ar/result/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5818,17 +3835,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/start" -->
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-ar/result/start"
-             _metaschema-json-id="/assembly/oscal-ar/result/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5848,17 +3858,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/end" -->
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-ar/result/end"
-             _metaschema-json-id="/assembly/oscal-ar/result/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5878,17 +3881,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5908,15 +3904,8 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions" -->
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ar/result/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -5932,17 +3921,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5962,18 +3944,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5993,17 +3968,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6023,17 +3991,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6053,16 +4014,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -6074,17 +4026,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6104,17 +4049,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6134,18 +4072,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6165,17 +4096,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6195,17 +4119,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6225,15 +4142,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component" -->
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -6245,17 +4154,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6275,17 +4177,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6305,17 +4200,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6335,17 +4223,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6365,18 +4246,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6396,17 +4270,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6426,17 +4293,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/authorized-privilege/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6456,18 +4316,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/authorized-privilege/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6487,17 +4340,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6517,18 +4363,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6548,17 +4387,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6578,17 +4410,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6608,16 +4433,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -6629,17 +4445,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6659,17 +4468,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6689,15 +4491,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform" -->
-      <assembly _step="assessment-platform"
-                _key="assessment-platforms"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms"
-                name="assessment-platform"
-                _using-name="assessment-platform"
-                _in-xml-name="assessment-platform"
-                _in-json-name="assessment-platforms"
-                gi="assessment-platform">
+      <assembly name="assessment-platform" gi="assessment-platform">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -6710,17 +4504,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6740,17 +4527,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6770,15 +4550,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component" -->
-      <assembly _step="uses-component"
-                _key="uses-components"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components"
-                name="uses-component"
-                _using-name="uses-component"
-                _in-xml-name="uses-component"
-                _in-json-name="uses-components"
-                gi="uses-component">
+      <assembly name="uses-component" gi="uses-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -6790,17 +4562,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6820,17 +4585,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6850,17 +4608,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6880,18 +4631,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6911,17 +4655,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6941,16 +4678,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing" -->
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -6963,17 +4691,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/on-date" -->
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -6985,15 +4703,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range" -->
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -7007,15 +4718,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency" -->
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -7028,15 +4732,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/dependency" -->
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -7045,15 +4741,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity" -->
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="*[@key='activity-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -7066,17 +4754,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7096,17 +4777,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7126,18 +4800,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7157,17 +4824,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7188,15 +4848,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7207,17 +4860,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7237,17 +4883,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7267,18 +4906,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7298,17 +4930,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7329,15 +4954,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7348,17 +4966,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7378,17 +4989,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7408,17 +5012,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7438,18 +5035,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7469,17 +5059,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7499,15 +5082,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -7521,18 +5096,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7552,17 +5120,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7583,15 +5144,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7602,18 +5156,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -7622,16 +5165,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -7648,18 +5184,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -7668,16 +5193,9 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -7694,15 +5212,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -7716,18 +5226,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7747,17 +5250,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7778,15 +5274,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7797,15 +5286,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation" -->
-      <assembly _step="attestation"
-                _key="attestations"
-                _metaschema-xml-id="/assembly/oscal-ar/result/attestation"
-                _metaschema-json-id="/assembly/oscal-ar/result/attestations"
-                name="attestation"
-                _using-name="attestation"
-                _in-xml-name="attestation"
-                _in-json-name="attestations"
-                gi="attestation">
+      <assembly name="attestation" gi="attestation">
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
          <xsl:apply-templates select="*[@key='parts']"/>
       </assembly>
@@ -7814,17 +5295,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7844,17 +5318,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7874,9 +5341,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -7887,7 +5354,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -7898,17 +5365,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7928,16 +5388,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log" -->
-      <assembly _step="assessment-log"
-                _key="assessment-log"
-                _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log"
-                _metaschema-json-id="/assembly/oscal-ar/result/assessment-log"
-                name="assessment-log"
-                key="assessment-log"
-                _using-name="assessment-log"
-                _in-xml-name="assessment-log"
-                _in-json-name="assessment-log"
-                gi="assessment-log">
+      <assembly name="assessment-log" key="assessment-log" gi="assessment-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-log</xsl:attribute>
          </xsl:if>
@@ -7948,15 +5399,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry" -->
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry"
-                _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -7973,17 +5416,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8003,18 +5439,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8034,17 +5463,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/start" -->
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8064,17 +5486,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/end" -->
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8094,17 +5509,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8124,17 +5532,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8154,17 +5555,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8184,18 +5578,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8215,17 +5602,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8246,15 +5626,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -8265,17 +5638,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8295,17 +5661,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8325,15 +5684,8 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -8346,18 +5698,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8377,17 +5722,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8408,15 +5746,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -8427,17 +5758,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8457,17 +5781,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8487,17 +5804,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8517,18 +5827,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8548,17 +5851,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8578,16 +5874,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/method" -->
-      <field _step="method"
-             _key="methods"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/method"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/methods"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="method"
-             _using-name="method"
-             _in-xml-name="method"
-             _in-json-name="methods"
              gi="method"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -8604,16 +5893,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/type" -->
-      <field _step="type"
-             _key="types"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/type"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/types"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="type"
-             _using-name="type"
-             _in-xml-name="type"
-             _in-json-name="types"
              gi="type"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -8630,17 +5912,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8660,17 +5935,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8690,17 +5958,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8720,18 +5981,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8751,17 +6005,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8782,15 +6029,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -8801,17 +6041,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8831,17 +6064,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8861,15 +6087,8 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -8882,18 +6101,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8913,17 +6125,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8944,15 +6149,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -8963,17 +6161,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8993,17 +6184,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9023,18 +6207,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -9047,17 +6220,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9077,17 +6243,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9107,15 +6266,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/relevant-evidence" -->
-      <assembly _step="relevant-evidence"
-                _key="relevant-evidence"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                name="relevant-evidence"
-                _using-name="relevant-evidence"
-                _in-xml-name="relevant-evidence"
-                _in-json-name="relevant-evidence"
-                gi="relevant-evidence">
+      <assembly name="relevant-evidence" gi="relevant-evidence">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -9127,18 +6278,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/relevant-evidence/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9158,17 +6302,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/relevant-evidence/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9188,17 +6325,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/collected" -->
-      <field _step="collected"
-             _key="collected"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/collected"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/collected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="collected"
              key="collected"
-             _using-name="collected"
-             _in-xml-name="collected"
-             _in-json-name="collected"
              gi="collected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9218,17 +6348,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/expires" -->
-      <field _step="expires"
-             _key="expires"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/expires"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/expires"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="expires"
              key="expires"
-             _using-name="expires"
-             _in-xml-name="expires"
-             _in-json-name="expires"
              gi="expires"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9248,17 +6371,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9278,18 +6394,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9309,18 +6418,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/statement" -->
-      <field _step="statement"
-             _key="statement"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/statement"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/statement"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="statement"
              key="statement"
-             _using-name="statement"
-             _in-xml-name="statement"
-             _in-json-name="statement"
              gi="statement"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9340,17 +6442,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9370,17 +6465,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/status" -->
-      <field _step="status"
-             _key="status"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/status"
-             collapsible="no"
+      <field 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">
          <xsl:if test="$with-key">
@@ -9400,17 +6488,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9430,17 +6511,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9460,17 +6534,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9490,18 +6557,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9521,17 +6581,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9552,15 +6605,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -9571,17 +6617,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9601,17 +6640,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9631,15 +6663,8 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -9652,18 +6677,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9683,17 +6701,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9714,15 +6725,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -9733,17 +6737,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9763,17 +6760,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9793,17 +6783,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9823,17 +6806,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9853,17 +6829,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9883,17 +6852,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9913,18 +6875,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9944,17 +6899,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9975,15 +6923,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -9994,17 +6935,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10024,17 +6958,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10054,15 +6981,8 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -10075,18 +6995,11 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10106,17 +7019,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10137,15 +7043,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -10156,17 +7055,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10186,17 +7078,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10216,15 +7101,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/facet" -->
-      <assembly _step="facet"
-                _key="facets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet"
-                _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets"
-                name="facet"
-                _using-name="facet"
-                _in-xml-name="facet"
-                _in-json-name="facets"
-                gi="facet">
+      <assembly name="facet" gi="facet">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='value']"/>
@@ -10237,17 +7114,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/facet/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10267,15 +7137,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor" -->
-      <assembly _step="mitigating-factor"
-                _key="mitigating-factors"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors"
-                name="mitigating-factor"
-                _using-name="mitigating-factor"
-                _in-xml-name="mitigating-factor"
-                _in-json-name="mitigating-factors"
-                gi="mitigating-factor">
+      <assembly name="mitigating-factor" gi="mitigating-factor">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='implementation-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -10288,18 +7150,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10319,17 +7174,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10349,18 +7197,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -10373,17 +7210,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10403,17 +7233,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10433,17 +7256,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/deadline" -->
-      <field _step="deadline"
-             _key="deadline"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/deadline"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/deadline"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="deadline"
              key="deadline"
-             _using-name="deadline"
-             _in-xml-name="deadline"
-             _in-json-name="deadline"
              gi="deadline"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10463,18 +7279,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:response"
-                _step="response"
-                _key="remediations"
-                _key-ref="oscal-assessment-common:response"
-                _using-name="response"
-                _in-xml-name="response"
-                _in-json-name="remediations"
-                gi="response">
+      <assembly name="response" gi="response">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='lifecycle']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -10491,17 +7296,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10521,18 +7319,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10552,17 +7343,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10582,17 +7366,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10612,17 +7389,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10642,17 +7412,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10672,18 +7435,11 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10703,17 +7459,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10734,15 +7483,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -10753,17 +7495,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10783,17 +7518,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10813,15 +7541,8 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -10834,18 +7555,11 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10865,17 +7579,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10896,15 +7603,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -10915,17 +7615,10 @@
                  priority="21">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10945,17 +7638,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10975,15 +7661,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset" -->
-      <assembly _step="required-asset"
-                _key="required-assets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset"
-                _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets"
-                name="required-asset"
-                _using-name="required-asset"
-                _in-xml-name="required-asset"
-                _in-json-name="required-assets"
-                gi="required-asset">
+      <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='subjects']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -10997,18 +7675,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -11021,17 +7688,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11051,17 +7711,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11081,17 +7734,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11111,18 +7757,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11142,17 +7781,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11172,17 +7804,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11202,18 +7827,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11233,17 +7851,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11263,16 +7874,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing" -->
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -11285,17 +7887,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing/on-date" -->
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -11307,15 +7899,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing/within-date-range" -->
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -11329,15 +7914,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing/at-frequency" -->
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -11350,15 +7928,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/dependency" -->
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -11367,15 +7937,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity" -->
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="*[@key='activity-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -11388,17 +7950,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11418,17 +7973,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11448,18 +7996,11 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11479,17 +8020,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11510,15 +8044,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -11529,17 +8056,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11559,17 +8079,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11589,18 +8102,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11620,17 +8126,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11651,15 +8150,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -11670,17 +8162,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11700,17 +8185,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11730,17 +8208,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11760,16 +8231,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log" -->
-      <assembly _step="risk-log"
-                _key="risk-log"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log"
-                name="risk-log"
-                key="risk-log"
-                _using-name="risk-log"
-                _in-xml-name="risk-log"
-                _in-json-name="risk-log"
-                gi="risk-log">
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">risk-log</xsl:attribute>
          </xsl:if>
@@ -11780,15 +8242,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry" -->
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -11806,17 +8260,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11836,18 +8283,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11867,17 +8307,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/start" -->
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11897,17 +8330,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/end" -->
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11927,17 +8353,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11957,15 +8376,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response" -->
-      <assembly _step="related-response"
-                _key="related-responses"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses"
-                name="related-response"
-                _using-name="related-response"
-                _in-xml-name="related-response"
-                _in-json-name="related-responses"
-                gi="related-response">
+      <assembly name="related-response" gi="related-response">
          <xsl:apply-templates select="*[@key='response-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -11977,17 +8388,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12007,17 +8411,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12037,17 +8434,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12067,18 +8457,11 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12098,17 +8481,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12129,15 +8505,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -12148,17 +8517,10 @@
                  priority="21">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12178,17 +8540,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12208,15 +8563,8 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -12229,18 +8577,11 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12260,17 +8601,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12291,15 +8625,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -12310,17 +8637,10 @@
                  priority="22">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12340,17 +8660,10 @@
                  priority="21">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12370,16 +8683,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/related-observation" -->
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
@@ -12387,17 +8691,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/title"
-             _metaschema-json-id="/assembly/oscal-ar/finding/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12417,18 +8714,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/description"
-             _metaschema-json-id="/assembly/oscal-ar/finding/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12448,17 +8738,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12478,17 +8761,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12508,17 +8784,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12538,17 +8807,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12568,18 +8830,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12599,17 +8854,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12630,15 +8878,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -12649,17 +8890,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12679,17 +8913,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12709,15 +8936,8 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -12730,18 +8950,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12761,17 +8974,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12792,15 +8998,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -12811,17 +9010,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12841,17 +9033,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12871,17 +9056,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12901,18 +9079,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12932,17 +9103,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12962,16 +9126,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/status" -->
-      <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">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -12984,17 +9139,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/implementation-statement-uuid" -->
-      <field _step="implementation-statement-uuid"
-             _key="implementation-statement-uuid"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/implementation-statement-uuid"
-             _metaschema-json-id="/assembly/oscal-ar/finding/implementation-statement-uuid"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="implementation-statement-uuid"
              key="implementation-statement-uuid"
-             _using-name="implementation-statement-uuid"
-             _in-xml-name="implementation-statement-uuid"
-             _in-json-name="implementation-statement-uuid"
              gi="implementation-statement-uuid"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13014,16 +9162,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/related-observation" -->
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-ar/finding/related-observation"
-                _metaschema-json-id="/assembly/oscal-ar/finding/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
@@ -13031,16 +9170,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/associated-risk" -->
-      <assembly as-type="empty"
-                _step="associated-risk"
-                _key="related-risks"
-                _metaschema-xml-id="/assembly/oscal-ar/finding/associated-risk"
-                _metaschema-json-id="/assembly/oscal-ar/finding/related-risks"
-                name="associated-risk"
-                _using-name="associated-risk"
-                _in-xml-name="associated-risk"
-                _in-json-name="related-risks"
-                gi="associated-risk">
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="*[@key='risk-uuid']"/>
       </assembly>
    </xsl:template>
@@ -13048,15 +9178,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -13072,17 +9194,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13102,18 +9217,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13133,19 +9241,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -13162,16 +9260,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -13184,17 +9273,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13214,17 +9296,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13244,15 +9319,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -13262,17 +9329,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -13326,11 +9386,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 eb4ec46fb2..2a4c03dd26 100644
--- a/xml/convert/oscal_catalog_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_catalog_json-to-xml-converter.xsl
@@ -74,14 +74,7 @@
    <xsl:template match="j:map[@key='catalog']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog"
-                _metaschema-json-id="/assembly/oscal-catalog/catalog"
-                name="catalog"
-                key="catalog"
-                _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">
+      <assembly name="catalog" key="catalog" gi="catalog">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">catalog</xsl:attribute>
          </xsl:if>
@@ -99,19 +92,7 @@
    <xsl:template match="j:map[@key='metadata']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="metadata" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -134,18 +115,7 @@
    <xsl:template match="j:array[@key='props']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="prop" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -157,18 +127,7 @@
    <xsl:template match="j:array[@key='links']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="link" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
@@ -178,18 +137,7 @@
    <xsl:template match="j:array[@key='roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -202,18 +150,7 @@
    <xsl:template match="j:array[@key='locations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='address']"/>
@@ -228,18 +165,7 @@
    <xsl:template match="j:array[@key='parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='name']"/>
@@ -258,18 +184,7 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -280,18 +195,7 @@
    <xsl:template match="j:array[@key='params']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="param" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter"
-                _step="param"
-                _key="params"
-                _key-ref="oscal-catalog-common:parameter"
-                _using-name="param"
-                _in-xml-name="param"
-                _in-json-name="params"
-                gi="param">
+      <assembly name="parameter" gi="param">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='depends-on']"/>
@@ -309,18 +213,7 @@
    <xsl:template match="j:array[@key='constraints']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="constraint" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-constraint"
-                _step="constraint"
-                _key="constraints"
-                _key-ref="oscal-catalog-common:parameter-constraint"
-                _using-name="constraint"
-                _in-xml-name="constraint"
-                _in-json-name="constraints"
-                gi="constraint">
+      <assembly name="parameter-constraint" gi="constraint">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='tests']"/>
       </assembly>
@@ -328,37 +221,14 @@
    <xsl:template match="j:array[@key='guidelines']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="guideline" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-guideline"
-                _step="guideline"
-                _key="guidelines"
-                _key-ref="oscal-catalog-common:parameter-guideline"
-                _using-name="guideline"
-                _in-xml-name="guideline"
-                _in-json-name="guidelines"
-                gi="guideline">
+      <assembly name="parameter-guideline" gi="guideline">
          <xsl:apply-templates select="*[@key='prose']"/>
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='select']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="select" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/select"
-                _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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-selection"
-                _step="select"
-                _key="select"
-                _key-ref="oscal-catalog-common:parameter-selection"
-                _using-name="select"
-                _in-xml-name="select"
-                _in-json-name="select"
-                gi="select">
+      <assembly name="parameter-selection" key="select" gi="select">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">select</xsl:attribute>
          </xsl:if>
@@ -369,18 +239,7 @@
    <xsl:template match="j:array[@key='controls']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="control" -->
-      <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/src/metaschema/oscal_catalog_metaschema.xml"
-                _key-name="oscal-catalog:control"
-                _step="control"
-                _key="controls"
-                _key-ref="oscal-catalog:control"
-                _using-name="control"
-                _in-xml-name="control"
-                _in-json-name="controls"
-                gi="control">
+      <assembly name="control" gi="control">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -394,18 +253,7 @@
    <xsl:template match="j:array[@key='parts']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="part" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-catalog-common:part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="part" gi="part">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -420,18 +268,7 @@
    <xsl:template match="j:array[@key='groups']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="group" -->
-      <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/src/metaschema/oscal_catalog_metaschema.xml"
-                _key-name="oscal-catalog:group"
-                _step="group"
-                _key="groups"
-                _key-ref="oscal-catalog:group"
-                _using-name="group"
-                _in-xml-name="group"
-                _in-json-name="groups"
-                gi="group">
+      <assembly name="group" gi="group">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -446,19 +283,7 @@
    <xsl:template match="j:map[@key='back-matter']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="back-matter" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -468,21 +293,11 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -501,19 +316,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -529,19 +334,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -557,19 +352,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _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"
-             _key-ref="oscal-catalog-common:parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -585,20 +370,7 @@
    <xsl:template match="j:array[@key='hashes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="hash" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="*[@key='algorithm']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
@@ -612,15 +384,8 @@
    <xsl:template match="j:map[@key='catalog']/j:string[@key='uuid']"><!-- XML match="catalog/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-catalog/catalog/uuid"
-            _metaschema-json-id="/assembly/oscal-catalog/catalog/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -631,15 +396,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"><!-- XML match="prop/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -650,15 +408,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -667,18 +418,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"><!-- XML match="prop/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -688,15 +428,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"><!-- XML match="prop/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -707,15 +440,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"><!-- XML match="prop/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -726,15 +452,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"><!-- XML match="link/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -745,15 +464,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"><!-- XML match="link/@rel" -->
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -764,18 +476,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -787,15 +489,8 @@
                  priority="6"><!-- XML match="catalog/metadata/document-id/@scheme | catalog/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -804,18 +499,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"><!-- XML match="role/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -825,15 +509,8 @@
    <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"><!-- XML match="location/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -844,18 +521,8 @@
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="catalog/metadata/location/address/@type | catalog/metadata/party/address/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -867,15 +534,8 @@
                  priority="8"><!-- XML match="catalog/metadata/location/telephone-number/@type | catalog/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -886,15 +546,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"><!-- XML match="party/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -905,15 +558,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"><!-- XML match="party/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -925,15 +571,8 @@
                  priority="8"><!-- XML match="catalog/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -944,15 +583,8 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -961,18 +593,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='id']"><!-- XML match="param/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -982,15 +603,8 @@
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='class']"><!-- XML match="param/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1001,18 +615,8 @@
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='depends-on']"><!-- XML match="param/@depends-on" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/depends-on"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:depends-on"
-            _step="depends-on"
-            _key="depends-on"
-            _key-ref="oscal-catalog-common:depends-on"
-            _using-name="depends-on"
-            _in-xml-name="depends-on"
-            _in-json-name="depends-on"
             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
@@ -1023,15 +627,8 @@
    <xsl:template match="j:map[@key='select']/j:string[@key='how-many']"><!-- XML match="select/@how-many" -->
       <flag in-json="string"
             as-type="token"
-            _step="how-many"
-            _key="how-many"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
             name="how-many"
             key="how-many"
-            _using-name="how-many"
-            _in-xml-name="how-many"
-            _in-json-name="how-many"
             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
@@ -1040,18 +637,7 @@
                  mode="keep-value-property"
                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='id']"><!-- XML match="control/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog/control/id"
-            _metaschema-json-id="/assembly/oscal-catalog/control/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1061,15 +647,8 @@
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='class']"><!-- XML match="control/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog/control/class"
-            _metaschema-json-id="/assembly/oscal-catalog/control/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1078,18 +657,7 @@
                  mode="keep-value-property"
                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']"><!-- XML match="part/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1099,15 +667,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"><!-- XML match="part/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/name"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1116,18 +677,7 @@
                  mode="keep-value-property"
                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"><!-- XML match="part/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/ns"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1137,15 +687,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"><!-- XML match="part/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1154,18 +697,7 @@
                  mode="keep-value-property"
                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']"><!-- XML match="group/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog/group/id"
-            _metaschema-json-id="/assembly/oscal-catalog/group/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1175,15 +707,8 @@
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"><!-- XML match="group/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog/group/class"
-            _metaschema-json-id="/assembly/oscal-catalog/group/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1195,15 +720,8 @@
                  priority="6"><!-- XML match="catalog/back-matter/resource/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1215,15 +733,8 @@
                  priority="8"><!-- XML match="catalog/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1234,18 +745,8 @@
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="catalog/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1256,15 +757,8 @@
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -1276,15 +770,8 @@
                  priority="7"><!-- XML match="catalog/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -1295,18 +782,8 @@
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="catalog/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1318,17 +795,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1348,20 +818,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1381,20 +841,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1414,20 +864,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1447,20 +887,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1480,18 +910,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -1510,10 +929,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1524,17 +940,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1554,20 +963,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1587,20 +986,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1620,20 +1009,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1653,20 +1032,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1686,17 +1055,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1716,19 +1078,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -1745,17 +1097,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1775,17 +1120,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1805,17 +1143,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1835,18 +1166,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1866,17 +1190,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1896,17 +1213,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1926,19 +1236,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -1954,19 +1252,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -1983,17 +1271,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2013,17 +1294,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2043,17 +1317,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2073,17 +1340,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2103,19 +1363,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2132,19 +1382,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2161,16 +1401,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2187,17 +1420,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2217,17 +1443,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2247,17 +1466,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2277,16 +1489,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2303,17 +1508,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2333,19 +1531,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2362,19 +1550,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2391,18 +1569,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -2415,19 +1582,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2444,17 +1601,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2474,17 +1624,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2504,17 +1647,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2534,17 +1670,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2564,16 +1693,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2590,17 +1712,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2620,17 +1735,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2650,17 +1758,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2680,18 +1781,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2711,18 +1805,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2742,15 +1829,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -2759,17 +1838,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2789,9 +1861,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -2802,7 +1874,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -2813,16 +1885,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2839,17 +1904,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/control/title"
-             _metaschema-json-id="/assembly/oscal-catalog/control/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2869,17 +1927,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2899,17 +1950,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2929,18 +1973,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2960,18 +1997,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2991,15 +2021,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -3008,17 +2030,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3038,9 +2053,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -3051,7 +2066,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -3062,16 +2077,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3088,17 +2096,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3118,17 +2119,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3148,9 +2142,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -3161,7 +2155,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -3172,17 +2166,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3202,17 +2189,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/group/title"
-             _metaschema-json-id="/assembly/oscal-catalog/group/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3232,17 +2212,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3262,17 +2235,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3292,18 +2258,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3323,18 +2282,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3354,15 +2306,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -3371,17 +2315,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3401,9 +2338,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -3414,7 +2351,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -3425,16 +2362,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3451,17 +2381,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3481,17 +2404,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3511,9 +2427,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -3524,7 +2440,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -3535,17 +2451,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3565,17 +2474,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/control/title"
-             _metaschema-json-id="/assembly/oscal-catalog/control/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3595,17 +2497,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3625,17 +2520,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3655,18 +2543,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3686,18 +2567,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3717,15 +2591,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -3734,17 +2600,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3764,9 +2623,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -3777,7 +2636,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -3788,16 +2647,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3814,17 +2666,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3844,17 +2689,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3874,9 +2712,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -3887,7 +2725,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -3898,17 +2736,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3928,15 +2759,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -3952,17 +2775,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3982,18 +2798,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4013,19 +2822,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4042,16 +2841,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -4064,17 +2854,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4094,17 +2877,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4124,15 +2900,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -4142,17 +2910,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -4206,11 +2967,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 8eb7cfecc8..760c872d4e 100644
--- a/xml/convert/oscal_complete_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_complete_json-to-xml-converter.xsl
@@ -74,14 +74,7 @@
    <xsl:template match="j:map[@key='catalog']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog"
-                _metaschema-json-id="/assembly/oscal-catalog/catalog"
-                name="catalog"
-                key="catalog"
-                _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">
+      <assembly name="catalog" key="catalog" gi="catalog">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">catalog</xsl:attribute>
          </xsl:if>
@@ -99,19 +92,7 @@
    <xsl:template match="j:map[@key='metadata']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="metadata" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -134,18 +115,7 @@
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="prop" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -157,18 +127,7 @@
    <xsl:template match="j:array[@key='links']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="link" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
@@ -178,18 +137,7 @@
    <xsl:template match="j:array[@key='roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -202,18 +150,7 @@
    <xsl:template match="j:array[@key='locations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='address']"/>
@@ -228,18 +165,7 @@
    <xsl:template match="j:array[@key='parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='name']"/>
@@ -258,18 +184,7 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -280,18 +195,7 @@
    <xsl:template match="j:array[@key='params']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="param" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter"
-                _step="param"
-                _key="params"
-                _key-ref="oscal-catalog-common:parameter"
-                _using-name="param"
-                _in-xml-name="param"
-                _in-json-name="params"
-                gi="param">
+      <assembly name="parameter" gi="param">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='depends-on']"/>
@@ -309,18 +213,7 @@
    <xsl:template match="j:array[@key='constraints']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="constraint" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-constraint"
-                _step="constraint"
-                _key="constraints"
-                _key-ref="oscal-catalog-common:parameter-constraint"
-                _using-name="constraint"
-                _in-xml-name="constraint"
-                _in-json-name="constraints"
-                gi="constraint">
+      <assembly name="parameter-constraint" gi="constraint">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='tests']"/>
       </assembly>
@@ -328,37 +221,14 @@
    <xsl:template match="j:array[@key='guidelines']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="guideline" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-guideline"
-                _step="guideline"
-                _key="guidelines"
-                _key-ref="oscal-catalog-common:parameter-guideline"
-                _using-name="guideline"
-                _in-xml-name="guideline"
-                _in-json-name="guidelines"
-                gi="guideline">
+      <assembly name="parameter-guideline" gi="guideline">
          <xsl:apply-templates select="*[@key='prose']"/>
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='select']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="select" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/select"
-                _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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-selection"
-                _step="select"
-                _key="select"
-                _key-ref="oscal-catalog-common:parameter-selection"
-                _using-name="select"
-                _in-xml-name="select"
-                _in-json-name="select"
-                gi="select">
+      <assembly name="parameter-selection" key="select" gi="select">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">select</xsl:attribute>
          </xsl:if>
@@ -369,18 +239,7 @@
    <xsl:template match="j:array[@key='controls']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="control" -->
-      <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/src/metaschema/oscal_catalog_metaschema.xml"
-                _key-name="oscal-catalog:control"
-                _step="control"
-                _key="controls"
-                _key-ref="oscal-catalog:control"
-                _using-name="control"
-                _in-xml-name="control"
-                _in-json-name="controls"
-                gi="control">
+      <assembly name="control" gi="control">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -394,18 +253,7 @@
    <xsl:template match="j:array[@key='controls']/j:map/j:array[@key='parts']/j:map | j:array[@key='controls']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map | j:array[@key='groups']/j:map/j:array[@key='parts']/j:map | j:array[@key='groups']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map | j:array[@key='controls']/j:map/j:array[@key='parts']/j:map | j:array[@key='controls']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map | j:array[@key='groups']/j:map/j:array[@key='parts']/j:map | j:array[@key='groups']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map | j:array[@key='adds']/j:map/j:array[@key='parts']/j:map | j:array[@key='adds']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map | j:array[@key='objectives-and-methods']/j:map/j:array[@key='parts']/j:map | j:array[@key='objectives-and-methods']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map | j:array[@key='objectives-and-methods']/j:map/j:array[@key='parts']/j:map | j:array[@key='objectives-and-methods']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="control/part | control/part//part | group/part | group/part//part | control/part | control/part//part | group/part | group/part//part | add/part | add/part//part | objectives-and-methods/part | objectives-and-methods/part//part | objectives-and-methods/part | objectives-and-methods/part//part" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-catalog-common:part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="part" gi="part">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -420,18 +268,7 @@
    <xsl:template match="j:map[@key='terms-and-conditions']/j:array[@key='parts']/j:map | j:map[@key='terms-and-conditions']/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map | j:array[@key='attestations']/j:map/j:array[@key='parts']/j:map | j:array[@key='attestations']/j:map/j:array[@key='parts']/j:map//j:array[@key='parts']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="terms-and-conditions/part | terms-and-conditions/part//part | attestation/part | attestation/part//part" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-assessment-common:assessment-part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="assessment-part" gi="part">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -446,18 +283,7 @@
    <xsl:template match="j:map[@key='catalog']/j:array[@key='groups']/j:map | j:map[@key='catalog']/j:array[@key='groups']/j:map//j:array[@key='groups']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/group | catalog/group//group" -->
-      <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/src/metaschema/oscal_catalog_metaschema.xml"
-                _key-name="oscal-catalog:group"
-                _step="group"
-                _key="groups"
-                _key-ref="oscal-catalog:group"
-                _using-name="group"
-                _in-xml-name="group"
-                _in-json-name="groups"
-                gi="group">
+      <assembly name="group" gi="group">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -472,18 +298,7 @@
    <xsl:template match="j:map[@key='custom']/j:array[@key='groups']/j:map | j:map[@key='custom']/j:array[@key='groups']/j:map//j:array[@key='groups']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="custom/group | custom/group//group" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:group"
-                _step="group"
-                _key="groups"
-                _key-ref="oscal-profile:group"
-                _using-name="group"
-                _in-xml-name="group"
-                _in-json-name="groups"
-                gi="group">
+      <assembly name="group" gi="group">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -498,19 +313,7 @@
    <xsl:template match="j:map[@key='back-matter']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="back-matter" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -520,14 +323,7 @@
    <xsl:template match="j:map[@key='profile']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile"
-                _metaschema-json-id="/assembly/oscal-profile/profile"
-                name="profile"
-                key="profile"
-                _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">
+      <assembly name="profile" key="profile" gi="profile">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">profile</xsl:attribute>
          </xsl:if>
@@ -545,18 +341,7 @@
    <xsl:template match="j:array[@key='imports']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:import"
-                _step="import"
-                _key="imports"
-                _key-ref="oscal-profile:import"
-                _using-name="import"
-                _in-xml-name="import"
-                _in-json-name="imports"
-                gi="import">
+      <assembly name="import" gi="import">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='include-all']"/>
          <xsl:apply-templates select="*[@key='include-controls']"/>
@@ -567,18 +352,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-all" -->
       <assembly as-type="empty"
-                _metaschema-xml-id="/assembly/oscal-profile/import/include-all"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:include-all"
-                _step="include-all"
-                _key="include-all"
-                _key-ref="oscal-profile:include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -588,19 +363,7 @@
    <xsl:template match="j:map[@key='merge']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="merge" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/merge"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:merge"
-                _step="merge"
-                _key="merge"
-                _key-ref="oscal-profile:merge"
-                _using-name="merge"
-                _in-xml-name="merge"
-                _in-json-name="merge"
-                gi="merge">
+      <assembly name="merge" key="merge" gi="merge">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">merge</xsl:attribute>
          </xsl:if>
@@ -612,20 +375,7 @@
    <xsl:template match="j:map[@key='combine']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="combine" -->
-      <assembly as-type="empty"
-                _metaschema-xml-id="/assembly/oscal-profile/merge/combine"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:combine"
-                _step="combine"
-                _key="combine"
-                _key-ref="oscal-profile:combine"
-                _using-name="combine"
-                _in-xml-name="combine"
-                _in-json-name="combine"
-                gi="combine">
+      <assembly as-type="empty" name="combine" key="combine" gi="combine">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">combine</xsl:attribute>
          </xsl:if>
@@ -635,19 +385,7 @@
    <xsl:template match="j:map[@key='custom']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="custom" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/merge/custom"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:custom"
-                _step="custom"
-                _key="custom"
-                _key-ref="oscal-profile:custom"
-                _using-name="custom"
-                _in-xml-name="custom"
-                _in-json-name="custom"
-                gi="custom">
+      <assembly name="custom" key="custom" gi="custom">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">custom</xsl:attribute>
          </xsl:if>
@@ -658,18 +396,7 @@
    <xsl:template match="j:array[@key='insert-controls']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="insert-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:insert-controls"
-                _step="insert-controls"
-                _key="insert-controls"
-                _key-ref="oscal-profile:insert-controls"
-                _using-name="insert-controls"
-                _in-xml-name="insert-controls"
-                _in-json-name="insert-controls"
-                gi="insert-controls">
+      <assembly name="insert-controls" gi="insert-controls">
          <xsl:apply-templates select="*[@key='order']"/>
          <xsl:apply-templates select="*[@key='include-all']"/>
          <xsl:apply-templates select="*[@key='include-controls']"/>
@@ -679,19 +406,7 @@
    <xsl:template match="j:map[@key='modify']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="modify" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/modify"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:modify"
-                _step="modify"
-                _key="modify"
-                _key-ref="oscal-profile:modify"
-                _using-name="modify"
-                _in-xml-name="modify"
-                _in-json-name="modify"
-                gi="modify">
+      <assembly name="modify" key="modify" gi="modify">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">modify</xsl:attribute>
          </xsl:if>
@@ -702,18 +417,7 @@
    <xsl:template match="j:array[@key='alters']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="alter" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:alter"
-                _step="alter"
-                _key="alters"
-                _key-ref="oscal-profile:alter"
-                _using-name="alter"
-                _in-xml-name="alter"
-                _in-json-name="alters"
-                gi="alter">
+      <assembly name="alter" gi="alter">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='removes']"/>
          <xsl:apply-templates select="*[@key='adds']"/>
@@ -722,19 +426,7 @@
    <xsl:template match="j:array[@key='removes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remove" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:remove"
-                _step="remove"
-                _key="removes"
-                _key-ref="oscal-profile:remove"
-                _using-name="remove"
-                _in-xml-name="remove"
-                _in-json-name="removes"
-                gi="remove">
+      <assembly as-type="empty" name="remove" gi="remove">
          <xsl:apply-templates select="*[@key='by-name']"/>
          <xsl:apply-templates select="*[@key='by-class']"/>
          <xsl:apply-templates select="*[@key='by-id']"/>
@@ -745,18 +437,7 @@
    <xsl:template match="j:array[@key='adds']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="add" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:add"
-                _step="add"
-                _key="adds"
-                _key-ref="oscal-profile:add"
-                _using-name="add"
-                _in-xml-name="add"
-                _in-json-name="adds"
-                gi="add">
+      <assembly name="add" gi="add">
          <xsl:apply-templates select="*[@key='position']"/>
          <xsl:apply-templates select="*[@key='by-id']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -769,13 +450,8 @@
    <xsl:template match="j:map[@key='component-definition']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition"
-                _metaschema-json-id="/assembly/oscal-component-definition/component-definition"
-                name="component-definition"
+      <assembly name="component-definition"
                 key="component-definition"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">component-definition</xsl:attribute>
@@ -795,17 +471,7 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-component-definition" -->
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:import-component-definition"
-                _step="import-component-definition"
-                _key="import-component-definitions"
-                _key-ref="oscal-component-definition:import-component-definition"
-                _using-name="import-component-definition"
-                _in-xml-name="import-component-definition"
-                _in-json-name="import-component-definitions"
                 gi="import-component-definition">
          <xsl:apply-templates select="*[@key='href']"/>
       </assembly>
@@ -813,18 +479,7 @@
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:defined-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-component-definition:defined-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="defined-component" gi="component">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -841,18 +496,7 @@
    <xsl:template match="j:map[@key='system-implementation']/j:array[@key='components']/j:map | j:map[@key='local-definitions']/j:array[@key='components']/j:map | j:map[@key='assessment-assets']/j:array[@key='components']/j:map | j:map[@key='local-definitions']/j:array[@key='components']/j:map | j:map[@key='assessment-assets']/j:array[@key='components']/j:map | j:map[@key='local-definitions']/j:array[@key='components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-implementation/component | local-definitions/component | assessment-assets/component | local-definitions/component | assessment-assets/component | local-definitions/component" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-implementation-common:system-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="system-component" gi="component">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -869,18 +513,7 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -891,18 +524,7 @@
    <xsl:template match="j:array[@key='protocols']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="protocol" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -912,19 +534,7 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="port-range" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="*[@key='start']"/>
          <xsl:apply-templates select="*[@key='end']"/>
          <xsl:apply-templates select="*[@key='transport']"/>
@@ -933,18 +543,7 @@
    <xsl:template match="j:array[@key='set-parameters']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="set-parameter" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:set-parameter"
-                _step="set-parameter"
-                _key="set-parameters"
-                _key-ref="oscal-implementation-common:set-parameter"
-                _using-name="set-parameter"
-                _in-xml-name="set-parameter"
-                _in-json-name="set-parameters"
-                gi="set-parameter">
+      <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="*[@key='param-id']"/>
          <xsl:apply-templates select="*[@key='values']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
@@ -953,18 +552,7 @@
    <xsl:template match="j:array[@key='capabilities']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="capability" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:capability"
-                _step="capability"
-                _key="capabilities"
-                _key-ref="oscal-component-definition:capability"
-                _using-name="capability"
-                _in-xml-name="capability"
-                _in-json-name="capabilities"
-                gi="capability">
+      <assembly name="capability" gi="capability">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -978,18 +566,7 @@
    <xsl:template match="j:array[@key='incorporates-components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="incorporates-component" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:incorporates-component"
-                _step="incorporates-component"
-                _key="incorporates-components"
-                _key-ref="oscal-component-definition:incorporates-component"
-                _using-name="incorporates-component"
-                _in-xml-name="incorporates-component"
-                _in-json-name="incorporates-components"
-                gi="incorporates-component">
+      <assembly name="incorporates-component" gi="incorporates-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
       </assembly>
@@ -997,13 +574,8 @@
    <xsl:template match="j:map[@key='system-security-plan']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan"
-                name="system-security-plan"
+      <assembly name="system-security-plan"
                 key="system-security-plan"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-security-plan</xsl:attribute>
@@ -1023,19 +595,7 @@
    <xsl:template match="j:map[@key='import-profile']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-profile" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/import-profile"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:import-profile"
-                _step="import-profile"
-                _key="import-profile"
-                _key-ref="oscal-ssp:import-profile"
-                _using-name="import-profile"
-                _in-xml-name="import-profile"
-                _in-json-name="import-profile"
-                gi="import-profile">
+      <assembly name="import-profile" key="import-profile" gi="import-profile">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-profile</xsl:attribute>
          </xsl:if>
@@ -1046,18 +606,8 @@
    <xsl:template match="j:map[@key='system-characteristics']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-characteristics" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
-                name="system-characteristics"
+      <assembly name="system-characteristics"
                 key="system-characteristics"
-                _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"
-                _key-ref="oscal-ssp:system-characteristics"
-                _using-name="system-characteristics"
-                _in-xml-name="system-characteristics"
-                _in-json-name="system-characteristics"
                 gi="system-characteristics">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-characteristics</xsl:attribute>
@@ -1083,18 +633,8 @@
    <xsl:template match="j:map[@key='system-information']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-information" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-information"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-information"
-                name="system-information"
+      <assembly name="system-information"
                 key="system-information"
-                _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"
-                _key-ref="oscal-ssp:system-information"
-                _using-name="system-information"
-                _in-xml-name="system-information"
-                _in-json-name="system-information"
                 gi="system-information">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-information</xsl:attribute>
@@ -1107,18 +647,8 @@
    <xsl:template match="j:map[@key='security-impact-level']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="security-impact-level" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
-                name="security-impact-level"
+      <assembly name="security-impact-level"
                 key="security-impact-level"
-                _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"
-                _key-ref="oscal-ssp:security-impact-level"
-                _using-name="security-impact-level"
-                _in-xml-name="security-impact-level"
-                _in-json-name="security-impact-level"
                 gi="security-impact-level">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-impact-level</xsl:attribute>
@@ -1131,18 +661,8 @@
    <xsl:template match="j:map[@key='authorization-boundary']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="authorization-boundary" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
-                name="authorization-boundary"
+      <assembly name="authorization-boundary"
                 key="authorization-boundary"
-                _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"
-                _key-ref="oscal-ssp:authorization-boundary"
-                _using-name="authorization-boundary"
-                _in-xml-name="authorization-boundary"
-                _in-json-name="authorization-boundary"
                 gi="authorization-boundary">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">authorization-boundary</xsl:attribute>
@@ -1157,18 +677,7 @@
    <xsl:template match="j:array[@key='diagrams']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="diagram" -->
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:diagram"
-                _step="diagram"
-                _key="diagrams"
-                _key-ref="oscal-ssp:diagram"
-                _using-name="diagram"
-                _in-xml-name="diagram"
-                _in-json-name="diagrams"
-                gi="diagram">
+      <assembly name="diagram" gi="diagram">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -1180,18 +689,8 @@
    <xsl:template match="j:map[@key='network-architecture']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="network-architecture" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
-                name="network-architecture"
+      <assembly name="network-architecture"
                 key="network-architecture"
-                _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"
-                _key-ref="oscal-ssp:network-architecture"
-                _using-name="network-architecture"
-                _in-xml-name="network-architecture"
-                _in-json-name="network-architecture"
                 gi="network-architecture">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">network-architecture</xsl:attribute>
@@ -1206,19 +705,7 @@
    <xsl:template match="j:map[@key='data-flow']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="data-flow" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/data-flow"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:data-flow"
-                _step="data-flow"
-                _key="data-flow"
-                _key-ref="oscal-ssp:data-flow"
-                _using-name="data-flow"
-                _in-xml-name="data-flow"
-                _in-json-name="data-flow"
-                gi="data-flow">
+      <assembly name="data-flow" key="data-flow" gi="data-flow">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">data-flow</xsl:attribute>
          </xsl:if>
@@ -1232,18 +719,8 @@
    <xsl:template match="j:map[@key='system-implementation']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-implementation" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
-                name="system-implementation"
+      <assembly name="system-implementation"
                 key="system-implementation"
-                _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"
-                _key-ref="oscal-ssp:system-implementation"
-                _using-name="system-implementation"
-                _in-xml-name="system-implementation"
-                _in-json-name="system-implementation"
                 gi="system-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-implementation</xsl:attribute>
@@ -1260,18 +737,7 @@
    <xsl:template match="j:array[@key='users']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="user" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-user"
-                _step="user"
-                _key="users"
-                _key-ref="oscal-implementation-common:system-user"
-                _using-name="user"
-                _in-xml-name="user"
-                _in-json-name="users"
-                gi="user">
+      <assembly name="system-user" gi="user">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -1286,18 +752,7 @@
    <xsl:template match="j:array[@key='authorized-privileges']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="authorized-privilege" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:authorized-privilege"
-                _step="authorized-privilege"
-                _key="authorized-privileges"
-                _key-ref="oscal-implementation-common:authorized-privilege"
-                _using-name="authorized-privilege"
-                _in-xml-name="authorized-privilege"
-                _in-json-name="authorized-privileges"
-                gi="authorized-privilege">
+      <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='functions-performed']"/>
@@ -1306,18 +761,7 @@
    <xsl:template match="j:array[@key='inventory-items']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="inventory-item" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:inventory-item"
-                _step="inventory-item"
-                _key="inventory-items"
-                _key-ref="oscal-implementation-common:inventory-item"
-                _using-name="inventory-item"
-                _in-xml-name="inventory-item"
-                _in-json-name="inventory-items"
-                gi="inventory-item">
+      <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -1330,18 +774,7 @@
    <xsl:template match="j:array[@key='by-components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="by-component" -->
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:by-component"
-                _step="by-component"
-                _key="by-components"
-                _key-ref="oscal-ssp:by-component"
-                _using-name="by-component"
-                _in-xml-name="by-component"
-                _in-json-name="by-components"
-                gi="by-component">
+      <assembly name="by-component" gi="by-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -1359,18 +792,8 @@
    <xsl:template match="j:map[@key='implementation-status']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="implementation-status" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/by-component/implementation-status"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/implementation-status"
-                name="implementation-status"
+      <assembly name="implementation-status"
                 key="implementation-status"
-                _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"
-                _key-ref="oscal-implementation-common:implementation-status"
-                _using-name="implementation-status"
-                _in-xml-name="implementation-status"
-                _in-json-name="implementation-status"
                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
@@ -1382,14 +805,7 @@
    <xsl:template match="j:map[@key='assessment-plan']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan"
-                _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/src/metaschema/oscal_assessment-plan_metaschema.xml"
-                _key-name="oscal-ap:assessment-plan"
-                _using-root-name="assessment-plan"
-                gi="assessment-plan">
+      <assembly name="assessment-plan" key="assessment-plan" gi="assessment-plan">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-plan</xsl:attribute>
          </xsl:if>
@@ -1411,19 +827,7 @@
    <xsl:template match="j:map[@key='import-ssp']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-ssp" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/import-ssp"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:import-ssp"
-                _step="import-ssp"
-                _key="import-ssp"
-                _key-ref="oscal-assessment-common:import-ssp"
-                _using-name="import-ssp"
-                _in-xml-name="import-ssp"
-                _in-json-name="import-ssp"
-                gi="import-ssp">
+      <assembly name="import-ssp" key="import-ssp" gi="import-ssp">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-ssp</xsl:attribute>
          </xsl:if>
@@ -1434,18 +838,7 @@
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="objectives-and-methods" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:local-objective"
-                _step="objectives-and-methods"
-                _key="objectives-and-methods"
-                _key-ref="oscal-assessment-common:local-objective"
-                _using-name="objectives-and-methods"
-                _in-xml-name="objectives-and-methods"
-                _in-json-name="objectives-and-methods"
-                gi="objectives-and-methods">
+      <assembly name="local-objective" gi="objectives-and-methods">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -1457,18 +850,7 @@
    <xsl:template match="j:array[@key='activities']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="activity" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:activity"
-                _step="activity"
-                _key="activities"
-                _key-ref="oscal-assessment-common:activity"
-                _using-name="activity"
-                _in-xml-name="activity"
-                _in-json-name="activities"
-                gi="activity">
+      <assembly name="activity" gi="activity">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -1483,18 +865,8 @@
    <xsl:template match="j:map[@key='reviewed-controls']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="reviewed-controls" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/reviewed-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="reviewed-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="reviewed-controls"
-                _in-xml-name="reviewed-controls"
-                _in-json-name="reviewed-controls"
                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
@@ -1511,17 +883,7 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-objective" -->
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="include-objective"
-                _key="include-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="include-objective"
-                _in-xml-name="include-objective"
-                _in-json-name="include-objectives"
                 gi="include-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
@@ -1530,17 +892,7 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="exclude-objective" -->
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-objective-by-id"
-                _step="exclude-objective"
-                _key="exclude-objectives"
-                _key-ref="oscal-assessment-common:select-objective-by-id"
-                _using-name="exclude-objective"
-                _in-xml-name="exclude-objective"
-                _in-json-name="exclude-objectives"
                 gi="exclude-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
@@ -1548,18 +900,8 @@
    <xsl:template match="j:map[@key='related-controls']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="related-controls" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/related-controls"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
-                name="reviewed-controls"
+      <assembly name="reviewed-controls"
                 key="related-controls"
-                _base-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"
-                _key-ref="oscal-assessment-common:reviewed-controls"
-                _using-name="related-controls"
-                _in-xml-name="related-controls"
-                _in-json-name="related-controls"
                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
@@ -1575,18 +917,7 @@
    <xsl:template match="j:array[@key='assessment-subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="assessment-subject"
-                _key="assessment-subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="assessment-subject"
-                _in-xml-name="assessment-subject"
-                _in-json-name="assessment-subjects"
-                gi="assessment-subject">
+      <assembly name="assessment-subject" gi="assessment-subject">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -1600,18 +931,7 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="include-subject"
-                _key="include-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="include-subject"
-                _in-xml-name="include-subject"
-                _in-json-name="include-subjects"
-                gi="include-subject">
+      <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -1622,18 +942,7 @@
    <xsl:template match="j:array[@key='exclude-subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="exclude-subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="exclude-subject"
-                _key="exclude-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="exclude-subject"
-                _in-xml-name="exclude-subject"
-                _in-json-name="exclude-subjects"
-                gi="exclude-subject">
+      <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -1644,18 +953,8 @@
    <xsl:template match="j:map[@key='assessment-assets']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-assets" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
-                name="assessment-assets"
+      <assembly name="assessment-assets"
                 key="assessment-assets"
-                _base-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"
-                _key-ref="oscal-assessment-common:assessment-assets"
-                _using-name="assessment-assets"
-                _in-xml-name="assessment-assets"
-                _in-json-name="assessment-assets"
                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
@@ -1667,18 +966,7 @@
    <xsl:template match="j:array[@key='tasks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="task" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="task"
-                _in-xml-name="task"
-                _in-json-name="tasks"
-                gi="task">
+      <assembly name="task" gi="task">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -1697,18 +985,7 @@
    <xsl:template match="j:array[@key='subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -1722,13 +999,8 @@
    <xsl:template match="j:map[@key='assessment-results']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results"
-                _metaschema-json-id="/assembly/oscal-ar/assessment-results"
-                name="assessment-results"
+      <assembly name="assessment-results"
                 key="assessment-results"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-results</xsl:attribute>
@@ -1747,19 +1019,7 @@
    <xsl:template match="j:map[@key='import-ap']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-ap" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/import-ap"
-                _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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:import-ap"
-                _step="import-ap"
-                _key="import-ap"
-                _key-ref="oscal-ar:import-ap"
-                _using-name="import-ap"
-                _in-xml-name="import-ap"
-                _in-json-name="import-ap"
-                gi="import-ap">
+      <assembly name="import-ap" key="import-ap" gi="import-ap">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-ap</xsl:attribute>
          </xsl:if>
@@ -1770,18 +1030,7 @@
    <xsl:template match="j:array[@key='results']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="result" -->
-      <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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:result"
-                _step="result"
-                _key="results"
-                _key-ref="oscal-ar:result"
-                _using-name="result"
-                _in-xml-name="result"
-                _in-json-name="results"
-                gi="result">
+      <assembly name="result" gi="result">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -1802,18 +1051,7 @@
    <xsl:template match="j:array[@key='tasks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-task" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="assessment-task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="assessment-task"
-                _in-xml-name="assessment-task"
-                _in-json-name="tasks"
-                gi="assessment-task">
+      <assembly name="task" gi="assessment-task">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -1832,19 +1070,7 @@
    <xsl:template match="j:array[@key='logged-by']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="logged-by" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:logged-by"
-                _step="logged-by"
-                _key="logged-by"
-                _key-ref="oscal-assessment-common:logged-by"
-                _using-name="logged-by"
-                _in-xml-name="logged-by"
-                _in-json-name="logged-by"
-                gi="logged-by">
+      <assembly as-type="empty" name="logged-by" gi="logged-by">
          <xsl:apply-templates select="*[@key='party-uuid']"/>
          <xsl:apply-templates select="*[@key='role-id']"/>
       </assembly>
@@ -1852,18 +1078,7 @@
    <xsl:template match="j:array[@key='related-tasks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="related-task" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:related-task"
-                _step="related-task"
-                _key="related-tasks"
-                _key-ref="oscal-assessment-common:related-task"
-                _using-name="related-task"
-                _in-xml-name="related-task"
-                _in-json-name="related-tasks"
-                gi="related-task">
+      <assembly name="related-task" gi="related-task">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -1876,18 +1091,7 @@
    <xsl:template match="j:array[@key='observations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="observation" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:observation"
-                _step="observation"
-                _key="observations"
-                _key-ref="oscal-assessment-common:observation"
-                _using-name="observation"
-                _in-xml-name="observation"
-                _in-json-name="observations"
-                gi="observation">
+      <assembly name="observation" gi="observation">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -1906,18 +1110,7 @@
    <xsl:template match="(j:array[@key='origins']/j:map | j:array[@key='origins']/j:map | j:map[@key='origin'] | j:array[@key='origins']/j:map | j:array[@key='origins']/j:map | j:array[@key='origins']/j:map | j:array[@key='origins']/j:map | j:map[@key='origin'] | j:array[@key='origins']/j:map | j:array[@key='origins']/j:map)">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="origin" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin"
-                _step="origin"
-                _key="origins"
-                _key-ref="oscal-assessment-common:origin"
-                _using-name="origin"
-                _in-xml-name="origin"
-                _in-json-name="origins"
-                gi="origin">
+      <assembly name="origin" gi="origin">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">origin</xsl:attribute>
          </xsl:if>
@@ -1928,18 +1121,7 @@
    <xsl:template match="j:array[@key='actors']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="actor" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin-actor"
-                _step="actor"
-                _key="actors"
-                _key-ref="oscal-assessment-common:origin-actor"
-                _using-name="actor"
-                _in-xml-name="actor"
-                _in-json-name="actors"
-                gi="actor">
+      <assembly name="origin-actor" gi="actor">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='actor-uuid']"/>
          <xsl:apply-templates select="*[@key='role-id']"/>
@@ -1950,18 +1132,7 @@
    <xsl:template match="j:array[@key='risks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="risk" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:risk"
-                _step="risk"
-                _key="risks"
-                _key-ref="oscal-assessment-common:risk"
-                _using-name="risk"
-                _in-xml-name="risk"
-                _in-json-name="risks"
-                gi="risk">
+      <assembly name="risk" gi="risk">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -1982,18 +1153,7 @@
    <xsl:template match="j:array[@key='characterizations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="characterization" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:characterization"
-                _step="characterization"
-                _key="characterizations"
-                _key-ref="oscal-assessment-common:characterization"
-                _using-name="characterization"
-                _in-xml-name="characterization"
-                _in-json-name="characterizations"
-                gi="characterization">
+      <assembly name="characterization" gi="characterization">
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='origin']"/>
@@ -2003,18 +1163,7 @@
    <xsl:template match="j:array[@key='findings']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="finding" -->
-      <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/src/metaschema/oscal_assessment-results_metaschema.xml"
-                _key-name="oscal-ar:finding"
-                _step="finding"
-                _key="findings"
-                _key-ref="oscal-ar:finding"
-                _using-name="finding"
-                _in-xml-name="finding"
-                _in-json-name="findings"
-                gi="finding">
+      <assembly name="finding" gi="finding">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -2031,19 +1180,7 @@
    <xsl:template match="j:map[@key='target']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="target" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ar/finding/target"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:finding-target"
-                _step="target"
-                _key="target"
-                _key-ref="oscal-assessment-common:finding-target"
-                _using-name="target"
-                _in-xml-name="target"
-                _in-json-name="target"
-                gi="target">
+      <assembly name="finding-target" key="target" gi="target">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">target</xsl:attribute>
          </xsl:if>
@@ -2061,13 +1198,8 @@
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones"
-                _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones"
-                name="plan-of-action-and-milestones"
+      <assembly 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/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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">plan-of-action-and-milestones</xsl:attribute>
@@ -2089,18 +1221,8 @@
    <xsl:template match="j:map[@key='local-definitions']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="local-definitions" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
-                _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _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"
-                _key-ref="oscal-poam:local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -2113,18 +1235,7 @@
    <xsl:template match="j:array[@key='poam-items']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="poam-item" -->
-      <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/src/metaschema/oscal_poam_metaschema.xml"
-                _key-name="oscal-poam:poam-item"
-                _step="poam-item"
-                _key="poam-items"
-                _key-ref="oscal-poam:poam-item"
-                _using-name="poam-item"
-                _in-xml-name="poam-item"
-                _in-json-name="poam-items"
-                gi="poam-item">
+      <assembly name="poam-item" gi="poam-item">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -2139,21 +1250,11 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2172,19 +1273,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2200,19 +1291,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2228,19 +1309,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _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"
-             _key-ref="oscal-catalog-common:parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2256,20 +1327,7 @@
    <xsl:template match="j:array[@key='hashes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="hash" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="*[@key='algorithm']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
@@ -2283,20 +1341,10 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-profile/merge/as-is"
-             collapsible="no"
+      <field collapsible="no"
              as-type="boolean"
              name="as-is"
              key="as-is"
-             _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"
-             _key-ref="oscal-profile:as-is"
-             _using-name="as-is"
-             _in-xml-name="as-is"
-             _in-json-name="as-is"
              gi="as-is"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2315,19 +1363,9 @@
    <xsl:template match="(j:array[@key='system-ids']/j:map | j:map[@key='system-id'])">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-id"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-id"
-             _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"
-             _key-ref="oscal-implementation-common:system-id"
-             _using-name="system-id"
-             _in-xml-name="system-id"
-             _in-json-name="system-ids"
              gi="system-id">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-id</xsl:attribute>
@@ -2346,19 +1384,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/role-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="role-id"
-             _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"
-             _key-ref="oscal-metadata:role-id"
-             _using-name="role-id"
-             _in-xml-name="role-id"
-             _in-json-name="role-ids"
              gi="role-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2374,19 +1402,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/functions-performed"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="function-performed"
-             _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"
-             _key-ref="oscal-implementation-common:function-performed"
-             _using-name="function-performed"
-             _in-xml-name="function-performed"
-             _in-json-name="functions-performed"
              gi="function-performed"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2402,20 +1420,7 @@
    <xsl:template match="j:array[@key='threat-ids']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="threat-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/threat-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/threat-ids"
-             collapsible="no"
-             as-type="uri"
-             name="threat-id"
-             _base-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"
-             _key-ref="oscal-assessment-common:threat-id"
-             _using-name="threat-id"
-             _in-xml-name="threat-id"
-             _in-json-name="threat-ids"
-             gi="threat-id">
+      <field collapsible="no" as-type="uri" name="threat-id" gi="threat-id">
          <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2430,20 +1435,10 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/status-change"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-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"
-             _key-ref="oscal-assessment-common:risk-status"
-             _using-name="status-change"
-             _in-xml-name="status-change"
-             _in-json-name="status-change"
              gi="status-change"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2462,15 +1457,8 @@
    <xsl:template match="j:map[@key='catalog']/j:string[@key='uuid']"><!-- XML match="catalog/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-catalog/catalog/uuid"
-            _metaschema-json-id="/assembly/oscal-catalog/catalog/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2481,15 +1469,8 @@
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)/j:string[@key='name']"><!-- XML match="prop/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -2500,15 +1481,8 @@
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)/j:string[@key='uuid']"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2517,18 +1491,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)/j:string[@key='ns']"><!-- XML match="prop/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2538,15 +1501,8 @@
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)/j:string[@key='value']"><!-- XML match="prop/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -2557,15 +1513,8 @@
    <xsl:template match="(j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='prop']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map | j:array[@key='props']/j:map)/j:string[@key='class']"><!-- XML match="prop/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -2576,15 +1525,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"><!-- XML match="link/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2595,15 +1537,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"><!-- XML match="link/@rel" -->
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -2614,18 +1549,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2637,15 +1562,8 @@
                  priority="6"><!-- XML match="catalog/metadata/document-id/@scheme | catalog/back-matter/resource/document-id/@scheme | profile/metadata/document-id/@scheme | profile/back-matter/resource/document-id/@scheme | component-definition/metadata/document-id/@scheme | component-definition/back-matter/resource/document-id/@scheme | system-security-plan/metadata/document-id/@scheme | system-security-plan/back-matter/resource/document-id/@scheme | assessment-plan/metadata/document-id/@scheme | assessment-plan/back-matter/resource/document-id/@scheme | assessment-results/metadata/document-id/@scheme | assessment-results/back-matter/resource/document-id/@scheme | plan-of-action-and-milestones/metadata/document-id/@scheme | plan-of-action-and-milestones/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -2654,18 +1572,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"><!-- XML match="role/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2675,15 +1582,8 @@
    <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"><!-- XML match="location/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2694,18 +1594,8 @@
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="catalog/metadata/location/address/@type | catalog/metadata/party/address/@type | profile/metadata/location/address/@type | profile/metadata/party/address/@type | component-definition/metadata/location/address/@type | component-definition/metadata/party/address/@type | system-security-plan/metadata/location/address/@type | system-security-plan/metadata/party/address/@type | assessment-plan/metadata/location/address/@type | assessment-plan/metadata/party/address/@type | assessment-results/metadata/location/address/@type | assessment-results/metadata/party/address/@type | plan-of-action-and-milestones/metadata/location/address/@type | plan-of-action-and-milestones/metadata/party/address/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2717,15 +1607,8 @@
                  priority="8"><!-- XML match="catalog/metadata/location/telephone-number/@type | catalog/metadata/party/telephone-number/@type | profile/metadata/location/telephone-number/@type | profile/metadata/party/telephone-number/@type | component-definition/metadata/location/telephone-number/@type | component-definition/metadata/party/telephone-number/@type | system-security-plan/metadata/location/telephone-number/@type | system-security-plan/metadata/party/telephone-number/@type | assessment-plan/metadata/location/telephone-number/@type | assessment-plan/metadata/party/telephone-number/@type | assessment-results/metadata/location/telephone-number/@type | assessment-results/metadata/party/telephone-number/@type | plan-of-action-and-milestones/metadata/location/telephone-number/@type | plan-of-action-and-milestones/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2736,15 +1619,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"><!-- XML match="party/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2755,15 +1631,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"><!-- XML match="party/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2775,15 +1644,8 @@
                  priority="8"><!-- XML match="catalog/metadata/party/external-id/@scheme | profile/metadata/party/external-id/@scheme | component-definition/metadata/party/external-id/@scheme | system-security-plan/metadata/party/external-id/@scheme | assessment-plan/metadata/party/external-id/@scheme | assessment-results/metadata/party/external-id/@scheme | plan-of-action-and-milestones/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -2794,15 +1656,8 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2811,18 +1666,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='id']"><!-- XML match="param/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2832,15 +1676,8 @@
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='class']"><!-- XML match="param/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -2851,18 +1688,8 @@
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='depends-on']"><!-- XML match="param/@depends-on" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/depends-on"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:depends-on"
-            _step="depends-on"
-            _key="depends-on"
-            _key-ref="oscal-catalog-common:depends-on"
-            _using-name="depends-on"
-            _in-xml-name="depends-on"
-            _in-json-name="depends-on"
             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
@@ -2873,15 +1700,8 @@
    <xsl:template match="j:map[@key='select']/j:string[@key='how-many']"><!-- XML match="select/@how-many" -->
       <flag in-json="string"
             as-type="token"
-            _step="how-many"
-            _key="how-many"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
             name="how-many"
             key="how-many"
-            _using-name="how-many"
-            _in-xml-name="how-many"
-            _in-json-name="how-many"
             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
@@ -2890,18 +1710,7 @@
                  mode="keep-value-property"
                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='id']"><!-- XML match="control/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog/control/id"
-            _metaschema-json-id="/assembly/oscal-catalog/control/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2911,15 +1720,8 @@
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='class']"><!-- XML match="control/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog/control/class"
-            _metaschema-json-id="/assembly/oscal-catalog/control/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -2928,18 +1730,7 @@
                  mode="keep-value-property"
                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']"><!-- XML match="part/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2949,15 +1740,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"><!-- XML match="part/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/name"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -2966,18 +1750,7 @@
                  mode="keep-value-property"
                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"><!-- XML match="part/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/ns"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -2987,15 +1760,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"><!-- XML match="part/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -3004,18 +1770,7 @@
                  mode="keep-value-property"
                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']"><!-- XML match="group/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog/group/id"
-            _metaschema-json-id="/assembly/oscal-catalog/group/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -3025,15 +1780,8 @@
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"><!-- XML match="group/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog/group/class"
-            _metaschema-json-id="/assembly/oscal-catalog/group/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -3045,15 +1793,8 @@
                  priority="6"><!-- XML match="catalog/back-matter/resource/@uuid | profile/back-matter/resource/@uuid | component-definition/back-matter/resource/@uuid | system-security-plan/back-matter/resource/@uuid | assessment-plan/back-matter/resource/@uuid | assessment-results/back-matter/resource/@uuid | plan-of-action-and-milestones/back-matter/resource/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3065,15 +1806,8 @@
                  priority="8"><!-- XML match="catalog/back-matter/resource/rlink/@href | profile/back-matter/resource/rlink/@href | component-definition/back-matter/resource/rlink/@href | system-security-plan/back-matter/resource/rlink/@href | assessment-plan/back-matter/resource/rlink/@href | assessment-results/back-matter/resource/rlink/@href | plan-of-action-and-milestones/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -3084,18 +1818,8 @@
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="catalog/back-matter/resource/rlink/@media-type | profile/back-matter/resource/rlink/@media-type | component-definition/back-matter/resource/rlink/@media-type | system-security-plan/back-matter/resource/rlink/@media-type | assessment-plan/back-matter/resource/rlink/@media-type | assessment-results/back-matter/resource/rlink/@media-type | plan-of-action-and-milestones/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -3106,15 +1830,8 @@
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -3126,15 +1843,8 @@
                  priority="7"><!-- XML match="catalog/back-matter/resource/base64/@filename | profile/back-matter/resource/base64/@filename | component-definition/back-matter/resource/base64/@filename | system-security-plan/back-matter/resource/base64/@filename | assessment-plan/back-matter/resource/base64/@filename | assessment-results/back-matter/resource/base64/@filename | plan-of-action-and-milestones/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -3145,18 +1855,8 @@
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="catalog/back-matter/resource/base64/@media-type | profile/back-matter/resource/base64/@media-type | component-definition/back-matter/resource/base64/@media-type | system-security-plan/back-matter/resource/base64/@media-type | assessment-plan/back-matter/resource/base64/@media-type | assessment-results/back-matter/resource/base64/@media-type | plan-of-action-and-milestones/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -3167,15 +1867,8 @@
    <xsl:template match="j:map[@key='profile']/j:string[@key='uuid']"><!-- XML match="profile/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-profile/profile/uuid"
-            _metaschema-json-id="/assembly/oscal-profile/profile/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3186,15 +1879,8 @@
    <xsl:template match="j:array[@key='imports']/j:map/j:string[@key='href']"><!-- XML match="import/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-profile/import/href"
-            _metaschema-json-id="/assembly/oscal-profile/import/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -3205,18 +1891,8 @@
    <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls']"><!-- XML match="profile/import/include-controls/@with-child-controls | profile/import/exclude-controls/@with-child-controls | profile/merge/custom//group/insert-controls/include-controls/@with-child-controls | profile/merge/custom//group/insert-controls/exclude-controls/@with-child-controls | profile/merge/custom/insert-controls/include-controls/@with-child-controls | profile/merge/custom/insert-controls/exclude-controls/@with-child-controls" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-child-controls"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:with-child-controls"
-            _step="with-child-controls"
-            _key="with-child-controls"
-            _key-ref="oscal-profile:with-child-controls"
-            _using-name="with-child-controls"
-            _in-xml-name="with-child-controls"
-            _in-json-name="with-child-controls"
             gi="with-child-controls">
          <xsl:value-of select="."/>
       </flag>
@@ -3227,18 +1903,8 @@
    <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern']"><!-- XML match="profile/import/include-controls/matching/@pattern | profile/import/exclude-controls/matching/@pattern | profile/merge/custom//group/insert-controls/include-controls/matching/@pattern | profile/merge/custom//group/insert-controls/exclude-controls/matching/@pattern | profile/merge/custom/insert-controls/include-controls/matching/@pattern | profile/merge/custom/insert-controls/exclude-controls/matching/@pattern" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching/pattern"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:pattern"
-            _step="pattern"
-            _key="pattern"
-            _key-ref="oscal-profile:pattern"
-            _using-name="pattern"
-            _in-xml-name="pattern"
-            _in-json-name="pattern"
             gi="pattern">
          <xsl:value-of select="."/>
       </flag>
@@ -3249,18 +1915,8 @@
    <xsl:template match="j:map[@key='combine']/j:string[@key='method']"><!-- XML match="combine/@method" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-profile/combine/method"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:method"
-            _step="method"
-            _key="method"
-            _key-ref="oscal-profile:method"
-            _using-name="method"
-            _in-xml-name="method"
-            _in-json-name="method"
             gi="method">
          <xsl:value-of select="."/>
       </flag>
@@ -3269,18 +1925,7 @@
                  mode="keep-value-property"
                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']"><!-- XML match="group/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-profile/group/id"
-            _metaschema-json-id="/assembly/oscal-profile/group/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -3290,15 +1935,8 @@
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"><!-- XML match="group/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-profile/group/class"
-            _metaschema-json-id="/assembly/oscal-profile/group/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -3309,15 +1947,8 @@
    <xsl:template match="j:array[@key='insert-controls']/j:map/j:string[@key='order']"><!-- XML match="insert-controls/@order" -->
       <flag in-json="string"
             as-type="token"
-            _step="order"
-            _key="order"
-            _metaschema-xml-id="/assembly/oscal-profile/insert-controls/order"
-            _metaschema-json-id="/assembly/oscal-profile/insert-controls/order"
             name="order"
             key="order"
-            _using-name="order"
-            _in-xml-name="order"
-            _in-json-name="order"
             gi="order">
          <xsl:value-of select="."/>
       </flag>
@@ -3329,15 +1960,8 @@
                  priority="6"><!-- XML match="profile/modify/set-parameter/@param-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="param-id"
-            _key="param-id"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/param-id"
-            _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/param-id"
             name="param-id"
             key="param-id"
-            _using-name="param-id"
-            _in-xml-name="param-id"
-            _in-json-name="param-id"
             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3349,15 +1973,8 @@
                  priority="6"><!-- XML match="profile/modify/set-parameter/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/class"
-            _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -3368,18 +1985,8 @@
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='depends-on']"><!-- XML match="profile/modify/set-parameter/@depends-on" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/depends-on"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:depends-on"
-            _step="depends-on"
-            _key="depends-on"
-            _key-ref="oscal-catalog-common:depends-on"
-            _using-name="depends-on"
-            _in-xml-name="depends-on"
-            _in-json-name="depends-on"
             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
@@ -3390,18 +1997,8 @@
    <xsl:template match="j:array[@key='alters']/j:map/j:string[@key='control-id']"><!-- XML match="alter/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/alter/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3412,15 +2009,8 @@
    <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-name']"><!-- XML match="remove/@by-name" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-name"
-            _key="by-name"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-name"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-name"
             name="by-name"
             key="by-name"
-            _using-name="by-name"
-            _in-xml-name="by-name"
-            _in-json-name="by-name"
             gi="by-name">
          <xsl:value-of select="."/>
       </flag>
@@ -3431,15 +2021,8 @@
    <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-class']"><!-- XML match="remove/@by-class" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-class"
-            _key="by-class"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-class"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-class"
             name="by-class"
             key="by-class"
-            _using-name="by-class"
-            _in-xml-name="by-class"
-            _in-json-name="by-class"
             gi="by-class">
          <xsl:value-of select="."/>
       </flag>
@@ -3450,15 +2033,8 @@
    <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-id']"><!-- XML match="remove/@by-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-id"
-            _key="by-id"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-id"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-id"
             name="by-id"
             key="by-id"
-            _using-name="by-id"
-            _in-xml-name="by-id"
-            _in-json-name="by-id"
             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3469,15 +2045,8 @@
    <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-item-name']"><!-- XML match="remove/@by-item-name" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-item-name"
-            _key="by-item-name"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-item-name"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-item-name"
             name="by-item-name"
             key="by-item-name"
-            _using-name="by-item-name"
-            _in-xml-name="by-item-name"
-            _in-json-name="by-item-name"
             gi="by-item-name">
          <xsl:value-of select="."/>
       </flag>
@@ -3488,15 +2057,8 @@
    <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-ns']"><!-- XML match="remove/@by-ns" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-ns"
-            _key="by-ns"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-ns"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-ns"
             name="by-ns"
             key="by-ns"
-            _using-name="by-ns"
-            _in-xml-name="by-ns"
-            _in-json-name="by-ns"
             gi="by-ns">
          <xsl:value-of select="."/>
       </flag>
@@ -3507,15 +2069,8 @@
    <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='position']"><!-- XML match="add/@position" -->
       <flag in-json="string"
             as-type="token"
-            _step="position"
-            _key="position"
-            _metaschema-xml-id="/assembly/oscal-profile/add/position"
-            _metaschema-json-id="/assembly/oscal-profile/add/position"
             name="position"
             key="position"
-            _using-name="position"
-            _in-xml-name="position"
-            _in-json-name="position"
             gi="position">
          <xsl:value-of select="."/>
       </flag>
@@ -3526,15 +2081,8 @@
    <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='by-id']"><!-- XML match="add/@by-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-id"
-            _key="by-id"
-            _metaschema-xml-id="/assembly/oscal-profile/add/by-id"
-            _metaschema-json-id="/assembly/oscal-profile/add/by-id"
             name="by-id"
             key="by-id"
-            _using-name="by-id"
-            _in-xml-name="by-id"
-            _in-json-name="by-id"
             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3545,15 +2093,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:string[@key='uuid']"><!-- XML match="component-definition/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/component-definition/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3564,15 +2105,8 @@
    <xsl:template match="j:array[@key='import-component-definitions']/j:map/j:string[@key='href']"><!-- XML match="import-component-definition/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-component-definition/import-component-definition/href"
-            _metaschema-json-id="/assembly/oscal-component-definition/import-component-definition/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -3583,15 +2117,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/defined-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3602,18 +2129,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/type"
-            _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/src/metaschema/oscal_component_metaschema.xml"
-            _key-name="oscal-component-definition:defined-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-component-definition:defined-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -3624,15 +2141,8 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3643,15 +2153,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3662,15 +2165,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -3681,15 +2177,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -3700,15 +2189,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -3719,15 +2201,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -3739,15 +2214,8 @@
                  priority="7"><!-- XML match="component-definition/component/control-implementation/@uuid | component-definition/capability/control-implementation/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3758,18 +2226,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source']"><!-- XML match="component-definition/component/control-implementation/@source | component-definition/capability/control-implementation/@source" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/source"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:source"
-            _step="source"
-            _key="source"
-            _key-ref="oscal-implementation-common:source"
-            _using-name="source"
-            _in-xml-name="source"
-            _in-json-name="source"
             gi="source">
          <xsl:value-of select="."/>
       </flag>
@@ -3780,18 +2238,8 @@
    <xsl:template match="j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"><!-- XML match="set-parameter/@param-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/param-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:param-id"
-            _step="param-id"
-            _key="param-id"
-            _key-ref="oscal-implementation-common:param-id"
-            _using-name="param-id"
-            _in-xml-name="param-id"
-            _in-json-name="param-id"
             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3803,15 +2251,8 @@
                  priority="9"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/@uuid | component-definition/capability/control-implementation/implemented-requirement/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3822,18 +2263,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/@control-id | component-definition/capability/control-implementation/implemented-requirement/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3844,18 +2275,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/@statement-id | component-definition/capability/control-implementation/implemented-requirement/statement/@statement-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-component-definition/statement/statement-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:statement-id"
-            _step="statement-id"
-            _key="statement-id"
-            _key-ref="oscal-implementation-common:statement-id"
-            _using-name="statement-id"
-            _in-xml-name="statement-id"
-            _in-json-name="statement-id"
             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
@@ -3867,15 +2288,8 @@
                  priority="11"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/@uuid | component-definition/capability/control-implementation/implemented-requirement/statement/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/statement/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/statement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3886,15 +2300,8 @@
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='uuid']"><!-- XML match="capability/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/capability/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/capability/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3905,15 +2312,8 @@
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='name']"><!-- XML match="capability/@name" -->
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-component-definition/capability/name"
-            _metaschema-json-id="/assembly/oscal-component-definition/capability/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -3924,15 +2324,8 @@
    <xsl:template match="j:array[@key='incorporates-components']/j:map/j:string[@key='component-uuid']"><!-- XML match="incorporates-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/incorporates-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/incorporates-component/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3943,15 +2336,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:string[@key='uuid']"><!-- XML match="system-security-plan/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -3962,15 +2348,8 @@
    <xsl:template match="j:map[@key='import-profile']/j:string[@key='href']"><!-- XML match="import-profile/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-ssp/import-profile/href"
-            _metaschema-json-id="/assembly/oscal-ssp/import-profile/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -3981,15 +2360,8 @@
    <xsl:template match="(j:array[@key='system-ids']/j:map | j:map[@key='system-id'])/j:string[@key='identifier-type']"><!-- XML match="system-id/@identifier-type" -->
       <flag in-json="string"
             as-type="uri"
-            _step="identifier-type"
-            _key="identifier-type"
-            _metaschema-xml-id="/field/oscal-implementation-common/system-id/identifier-type"
-            _metaschema-json-id="/field/oscal-implementation-common/system-id/identifier-type"
             name="identifier-type"
             key="identifier-type"
-            _using-name="identifier-type"
-            _in-xml-name="identifier-type"
-            _in-json-name="identifier-type"
             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
@@ -4001,15 +2373,8 @@
                  priority="7"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4021,15 +2386,8 @@
                  priority="9"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/@system" -->
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization/system"
-            _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -4041,15 +2399,8 @@
                  priority="5"><!-- XML match="system-security-plan/system-characteristics/status/@state" -->
       <flag in-json="string"
             as-type="string"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-ssp/status/state"
-            _metaschema-json-id="/assembly/oscal-ssp/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -4060,15 +2411,8 @@
    <xsl:template match="j:array[@key='diagrams']/j:map/j:string[@key='uuid']"><!-- XML match="diagram/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/diagram/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/diagram/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4080,15 +2424,8 @@
                  priority="6"><!-- XML match="system-security-plan/system-implementation/leveraged-authorization/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4099,15 +2436,8 @@
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']"><!-- XML match="user/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-user/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4118,15 +2448,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4137,18 +2460,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/type"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:system-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-implementation-common:system-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -4160,15 +2473,8 @@
                  priority="7"><!-- XML match="system-security-plan/system-implementation/component/status/@state | assessment-plan/local-definitions/component/status/@state | assessment-plan/assessment-assets/component/status/@state | assessment-results/result/local-definitions/component/status/@state | assessment-results/result/local-definitions/assessment-assets/component/status/@state | plan-of-action-and-milestones/local-definitions/component/status/@state" -->
       <flag in-json="string"
             as-type="token"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -4179,15 +2485,8 @@
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"><!-- XML match="inventory-item/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4199,15 +2498,8 @@
                  priority="8"><!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/@component-uuid | assessment-plan/local-definitions/inventory-item/implemented-component/@component-uuid | assessment-results/result/local-definitions/inventory-item/implemented-component/@component-uuid | plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4219,15 +2511,8 @@
                  priority="6"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4238,18 +2523,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -4260,18 +2535,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/@statement-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-ssp/statement/statement-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:statement-id"
-            _step="statement-id"
-            _key="statement-id"
-            _key-ref="oscal-implementation-common:statement-id"
-            _using-name="statement-id"
-            _in-xml-name="statement-id"
-            _in-json-name="statement-id"
             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
@@ -4283,15 +2548,8 @@
                  priority="8"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/statement/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/statement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4302,15 +2560,8 @@
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='component-uuid']"><!-- XML match="by-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4321,15 +2572,8 @@
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='uuid']"><!-- XML match="by-component/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4340,15 +2584,8 @@
    <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"><!-- XML match="implementation-status/@state" -->
       <flag in-json="string"
             as-type="token"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/implementation-status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/implementation-status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -4360,15 +2597,8 @@
                  priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4380,15 +2610,8 @@
                  priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4399,18 +2622,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@provided-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/provided-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:provided-uuid"
-            _step="provided-uuid"
-            _key="provided-uuid"
-            _key-ref="oscal-ssp:provided-uuid"
-            _using-name="provided-uuid"
-            _in-xml-name="provided-uuid"
-            _in-json-name="provided-uuid"
             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4422,15 +2635,8 @@
                  priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4441,18 +2647,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@provided-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/provided-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:provided-uuid"
-            _step="provided-uuid"
-            _key="provided-uuid"
-            _key-ref="oscal-ssp:provided-uuid"
-            _using-name="provided-uuid"
-            _in-xml-name="provided-uuid"
-            _in-json-name="provided-uuid"
             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4464,15 +2660,8 @@
                  priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4483,18 +2672,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@responsibility-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@responsibility-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/responsibility-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:responsibility-uuid"
-            _step="responsibility-uuid"
-            _key="responsibility-uuid"
-            _key-ref="oscal-ssp:responsibility-uuid"
-            _using-name="responsibility-uuid"
-            _in-xml-name="responsibility-uuid"
-            _in-json-name="responsibility-uuid"
             gi="responsibility-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4505,15 +2684,8 @@
    <xsl:template match="j:map[@key='assessment-plan']/j:string[@key='uuid']"><!-- XML match="assessment-plan/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/uuid"
-            _metaschema-json-id="/assembly/oscal-ap/assessment-plan/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4524,15 +2696,8 @@
    <xsl:template match="j:map[@key='import-ssp']/j:string[@key='href']"><!-- XML match="import-ssp/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/import-ssp/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/import-ssp/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -4543,18 +2708,8 @@
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:string[@key='control-id']"><!-- XML match="objectives-and-methods/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -4565,15 +2720,8 @@
    <xsl:template match="j:array[@key='activities']/j:map/j:string[@key='uuid']"><!-- XML match="activity/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4585,15 +2733,8 @@
                  priority="8"><!-- XML match="assessment-plan/local-definitions/activity/step/@uuid | assessment-results/local-definitions/activity/step/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4604,18 +2745,8 @@
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id']"><!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-plan/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/reviewed-controls/control-selection/exclude-control/@control-id | assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-results/result/reviewed-controls/control-selection/include-control/@control-id | assessment-results/result/reviewed-controls/control-selection/exclude-control/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -4626,18 +2757,8 @@
    <xsl:template match="j:array[@key='include-objectives']/j:map/j:string[@key='objective-id'] | j:array[@key='exclude-objectives']/j:map/j:string[@key='objective-id']"><!-- XML match="include-objective/@objective-id | exclude-objective/@objective-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:objective-id"
-            _step="objective-id"
-            _key="objective-id"
-            _key-ref="oscal-assessment-common:objective-id"
-            _using-name="objective-id"
-            _in-xml-name="objective-id"
-            _in-json-name="objective-id"
             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
@@ -4648,15 +2769,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='uuid']"><!-- XML match="part/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4667,15 +2781,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"><!-- XML match="part/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -4684,18 +2791,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"><!-- XML match="part/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -4705,15 +2801,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"><!-- XML match="part/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/class"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -4724,15 +2813,8 @@
    <xsl:template match="j:array[@key='assessment-subjects']/j:map/j:string[@key='type'] | j:array[@key='subjects']/j:map/j:string[@key='type']"><!-- XML match="assessment-subject/@type | subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -4743,18 +2825,8 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="include-subject/@subject-uuid | exclude-subject/@subject-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4765,18 +2837,8 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"><!-- XML match="include-subject/@type | exclude-subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -4788,15 +2850,8 @@
                  priority="6"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/@uuid | assessment-results/result/local-definitions/assessment-assets/assessment-platform/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4808,15 +2863,8 @@
                  priority="8"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/@component-uuid | assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4827,15 +2875,8 @@
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid'] | j:array[@key='tasks']/j:map/j:string[@key='uuid']"><!-- XML match="task/@uuid | assessment-task/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4846,15 +2887,8 @@
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type'] | j:array[@key='tasks']/j:map/j:string[@key='type']"><!-- XML match="task/@type | assessment-task/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -4866,15 +2900,8 @@
                  priority="8"><!-- XML match="assessment-plan//task/timing/on-date/@date | assessment-results/result/local-definitions//assessment-task/timing/on-date/@date | assessment-results/result/risk/response//task/timing/on-date/@date | plan-of-action-and-milestones/risk/response//task/timing/on-date/@date" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="date"
-            _key="date"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
             name="date"
             key="date"
-            _using-name="date"
-            _in-xml-name="date"
-            _in-json-name="date"
             gi="date">
          <xsl:value-of select="."/>
       </flag>
@@ -4886,15 +2913,8 @@
                  priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@start | assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@start | assessment-results/result/risk/response//task/timing/within-date-range/@start | plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@start" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -4906,15 +2926,8 @@
                  priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@end | assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@end | assessment-results/result/risk/response//task/timing/within-date-range/@end | plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@end" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -4926,15 +2939,8 @@
                  priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@period | assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@period | assessment-results/result/risk/response//task/timing/at-frequency/@period | plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@period" -->
       <flag in-json="number"
             as-type="positiveInteger"
-            _step="period"
-            _key="period"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
             name="period"
             key="period"
-            _using-name="period"
-            _in-xml-name="period"
-            _in-json-name="period"
             gi="period">
          <xsl:value-of select="."/>
       </flag>
@@ -4946,15 +2952,8 @@
                  priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@unit | assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@unit | assessment-results/result/risk/response//task/timing/at-frequency/@unit | plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@unit" -->
       <flag in-json="string"
             as-type="string"
-            _step="unit"
-            _key="unit"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
             name="unit"
             key="unit"
-            _using-name="unit"
-            _in-xml-name="unit"
-            _in-json-name="unit"
             gi="unit">
          <xsl:value-of select="."/>
       </flag>
@@ -4966,15 +2965,8 @@
                  priority="7"><!-- XML match="assessment-plan//task/dependency/@task-uuid | assessment-results/result/local-definitions//assessment-task/dependency/@task-uuid | assessment-results/result/risk/response//task/dependency/@task-uuid | plan-of-action-and-milestones/risk/response//task/dependency/@task-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -4986,15 +2978,8 @@
                  priority="7"><!-- XML match="assessment-plan//task/associated-activity/@activity-uuid | assessment-results/result/local-definitions//assessment-task/associated-activity/@activity-uuid | assessment-results/result/risk/response//task/associated-activity/@activity-uuid | plan-of-action-and-milestones/risk/response//task/associated-activity/@activity-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="activity-uuid"
-            _key="activity-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/activity-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/activity-uuid"
             name="activity-uuid"
             key="activity-uuid"
-            _using-name="activity-uuid"
-            _in-xml-name="activity-uuid"
-            _in-json-name="activity-uuid"
             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5005,15 +2990,8 @@
    <xsl:template match="j:map[@key='assessment-results']/j:string[@key='uuid']"><!-- XML match="assessment-results/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/assessment-results/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/assessment-results/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5024,15 +3002,8 @@
    <xsl:template match="j:map[@key='import-ap']/j:string[@key='href']"><!-- XML match="import-ap/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-ar/import-ap/href"
-            _metaschema-json-id="/assembly/oscal-ar/import-ap/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -5043,15 +3014,8 @@
    <xsl:template match="j:array[@key='results']/j:map/j:string[@key='uuid']"><!-- XML match="result/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/result/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/result/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5063,15 +3027,8 @@
                  priority="8"><!-- XML match="assessment-results/result/assessment-log/entry/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5082,15 +3039,8 @@
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='party-uuid']"><!-- XML match="logged-by/@party-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="party-uuid"
-            _key="party-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
             name="party-uuid"
             key="party-uuid"
-            _using-name="party-uuid"
-            _in-xml-name="party-uuid"
-            _in-json-name="party-uuid"
             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5101,15 +3051,8 @@
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='role-id']"><!-- XML match="logged-by/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5120,15 +3063,8 @@
    <xsl:template match="j:array[@key='related-tasks']/j:map/j:string[@key='task-uuid']"><!-- XML match="related-task/@task-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5140,15 +3076,8 @@
                  priority="11"><!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/finding/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="subject-placeholder-uuid"
-            _key="subject-placeholder-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
             name="subject-placeholder-uuid"
             key="subject-placeholder-uuid"
-            _using-name="subject-placeholder-uuid"
-            _in-xml-name="subject-placeholder-uuid"
-            _in-json-name="subject-placeholder-uuid"
             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5159,15 +3088,8 @@
    <xsl:template match="j:array[@key='observations']/j:map/j:string[@key='uuid']"><!-- XML match="observation/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5178,15 +3100,8 @@
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='type']"><!-- XML match="actor/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -5197,15 +3112,8 @@
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='actor-uuid']"><!-- XML match="actor/@actor-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="actor-uuid"
-            _key="actor-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
             name="actor-uuid"
             key="actor-uuid"
-            _using-name="actor-uuid"
-            _in-xml-name="actor-uuid"
-            _in-json-name="actor-uuid"
             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5216,15 +3124,8 @@
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='role-id']"><!-- XML match="actor/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5235,18 +3136,8 @@
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="assessment-results/result/observation/subject/@subject-uuid | assessment-results/result/risk/mitigating-factor/subject/@subject-uuid | assessment-results/result/risk/response/required-asset/subject/@subject-uuid | plan-of-action-and-milestones/observation/subject/@subject-uuid | plan-of-action-and-milestones/risk/mitigating-factor/subject/@subject-uuid | plan-of-action-and-milestones/risk/response/required-asset/subject/@subject-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5257,18 +3148,8 @@
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type']"><!-- XML match="assessment-results/result/observation/subject/@type | assessment-results/result/risk/mitigating-factor/subject/@type | assessment-results/result/risk/response/required-asset/subject/@type | plan-of-action-and-milestones/observation/subject/@type | plan-of-action-and-milestones/risk/mitigating-factor/subject/@type | plan-of-action-and-milestones/risk/response/required-asset/subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -5280,15 +3161,8 @@
                  priority="9"><!-- XML match="assessment-results/result/observation/relevant-evidence/@href | plan-of-action-and-milestones/observation/relevant-evidence/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -5299,15 +3173,8 @@
    <xsl:template match="j:array[@key='risks']/j:map/j:string[@key='uuid']"><!-- XML match="risk/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5318,15 +3185,8 @@
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='system']"><!-- XML match="threat-id/@system" -->
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/system"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -5337,15 +3197,8 @@
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='href']"><!-- XML match="threat-id/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/href"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -5357,15 +3210,8 @@
                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@name | plan-of-action-and-milestones/risk/characterization/facet/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -5377,15 +3223,8 @@
                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@system | plan-of-action-and-milestones/risk/characterization/facet/@system" -->
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/system"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -5397,15 +3236,8 @@
                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@value | plan-of-action-and-milestones/risk/characterization/facet/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/value"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -5417,15 +3249,8 @@
                  priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@uuid | plan-of-action-and-milestones/risk/mitigating-factor/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5437,15 +3262,8 @@
                  priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@implementation-uuid | plan-of-action-and-milestones/risk/mitigating-factor/@implementation-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="implementation-uuid"
-            _key="implementation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/implementation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/implementation-uuid"
             name="implementation-uuid"
             key="implementation-uuid"
-            _using-name="implementation-uuid"
-            _in-xml-name="implementation-uuid"
-            _in-json-name="implementation-uuid"
             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5457,15 +3275,8 @@
                  priority="9"><!-- XML match="assessment-results/result/risk/response/@uuid | plan-of-action-and-milestones/risk/response/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5477,15 +3288,8 @@
                  priority="9"><!-- XML match="assessment-results/result/risk/response/@lifecycle | plan-of-action-and-milestones/risk/response/@lifecycle" -->
       <flag in-json="string"
             as-type="token"
-            _step="lifecycle"
-            _key="lifecycle"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/lifecycle"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/lifecycle"
             name="lifecycle"
             key="lifecycle"
-            _using-name="lifecycle"
-            _in-xml-name="lifecycle"
-            _in-json-name="lifecycle"
             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
@@ -5497,15 +3301,8 @@
                  priority="11"><!-- XML match="assessment-results/result/risk/response/required-asset/@uuid | plan-of-action-and-milestones/risk/response/required-asset/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5517,15 +3314,8 @@
                  priority="10"><!-- XML match="assessment-results/result/risk/risk-log/entry/@uuid | plan-of-action-and-milestones/risk/risk-log/entry/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5537,15 +3327,8 @@
                  priority="12"><!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/@response-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/@response-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="response-uuid"
-            _key="response-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response/response-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses/response-uuid"
             name="response-uuid"
             key="response-uuid"
-            _using-name="response-uuid"
-            _in-xml-name="response-uuid"
-            _in-json-name="response-uuid"
             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5557,15 +3340,8 @@
                  priority="9"><!-- XML match="assessment-results/result/risk/related-observation/@observation-uuid | plan-of-action-and-milestones/risk/related-observation/@observation-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5576,15 +3352,8 @@
    <xsl:template match="j:array[@key='findings']/j:map/j:string[@key='uuid']"><!-- XML match="finding/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5595,15 +3364,8 @@
    <xsl:template match="j:map[@key='target']/j:string[@key='type']"><!-- XML match="target/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -5614,15 +3376,8 @@
    <xsl:template match="j:map[@key='target']/j:string[@key='target-id']"><!-- XML match="target/@target-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="target-id"
-            _key="target-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/target-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/target-id"
             name="target-id"
             key="target-id"
-            _using-name="target-id"
-            _in-xml-name="target-id"
-            _in-json-name="target-id"
             gi="target-id">
          <xsl:value-of select="."/>
       </flag>
@@ -5634,15 +3389,8 @@
                  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>
@@ -5654,15 +3402,8 @@
                  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>
@@ -5674,15 +3415,8 @@
                  priority="9"><!-- XML match="assessment-results/result/finding/related-observation/@observation-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5694,15 +3428,8 @@
                  priority="9"><!-- XML match="assessment-results/result/finding/associated-risk/@risk-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="risk-uuid"
-            _key="risk-uuid"
-            _metaschema-xml-id="/assembly/oscal-ar/finding/associated-risk/risk-uuid"
-            _metaschema-json-id="/assembly/oscal-ar/finding/related-risks/risk-uuid"
             name="risk-uuid"
             key="risk-uuid"
-            _using-name="risk-uuid"
-            _in-xml-name="risk-uuid"
-            _in-json-name="risk-uuid"
             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5713,15 +3440,8 @@
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:string[@key='uuid']"><!-- XML match="plan-of-action-and-milestones/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/uuid"
-            _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5732,15 +3452,8 @@
    <xsl:template match="j:array[@key='poam-items']/j:map/j:string[@key='uuid']"><!-- XML match="poam-item/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5752,15 +3465,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/related-observation/@observation-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5772,15 +3478,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/associated-risk/@risk-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="risk-uuid"
-            _key="risk-uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/associated-risk/risk-uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/related-risks/risk-uuid"
             name="risk-uuid"
             key="risk-uuid"
-            _using-name="risk-uuid"
-            _in-xml-name="risk-uuid"
-            _in-json-name="risk-uuid"
             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -5792,17 +3491,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5822,20 +3514,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5855,20 +3537,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5888,20 +3560,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5921,20 +3583,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5954,18 +3606,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -5984,10 +3625,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -5998,17 +3636,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6028,20 +3659,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6061,20 +3682,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6094,20 +3705,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6127,20 +3728,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6160,17 +3751,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6190,19 +3774,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6219,17 +3793,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6249,17 +3816,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6279,17 +3839,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6309,18 +3862,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6340,17 +3886,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6370,17 +3909,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6400,19 +3932,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -6428,19 +3948,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6457,17 +3967,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6487,17 +3990,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6517,17 +4013,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6547,17 +4036,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6577,19 +4059,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6606,19 +4078,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6635,16 +4097,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6661,17 +4116,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6691,17 +4139,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6721,17 +4162,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6751,16 +4185,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6777,17 +4204,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6807,19 +4227,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6836,19 +4246,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6865,18 +4265,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -6889,19 +4278,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6918,17 +4297,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6948,17 +4320,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6978,17 +4343,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7008,17 +4366,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7038,16 +4389,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -7064,17 +4408,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7094,17 +4431,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7124,17 +4454,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7154,18 +4477,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7185,18 +4501,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7216,15 +4525,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -7233,17 +4534,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7263,9 +4557,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -7276,7 +4570,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -7287,16 +4581,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -7313,17 +4600,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/control/title"
-             _metaschema-json-id="/assembly/oscal-catalog/control/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7343,17 +4623,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7373,17 +4646,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7403,18 +4669,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7434,18 +4693,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7465,15 +4717,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -7482,17 +4726,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7512,9 +4749,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -7525,7 +4762,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -7536,16 +4773,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -7562,17 +4792,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7592,17 +4815,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7622,9 +4838,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -7635,7 +4851,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -7646,17 +4862,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7676,17 +4885,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/group/title"
-             _metaschema-json-id="/assembly/oscal-catalog/group/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7706,17 +4908,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7736,17 +4931,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7766,18 +4954,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7797,18 +4978,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7828,15 +5002,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -7845,17 +5011,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7875,9 +5034,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -7888,7 +5047,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -7899,16 +5058,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -7925,17 +5077,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7955,17 +5100,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7985,9 +5123,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -7998,7 +5136,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -8009,17 +5147,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8039,17 +5170,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog/control/title"
-             _metaschema-json-id="/assembly/oscal-catalog/control/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8069,17 +5193,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8099,17 +5216,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8129,18 +5239,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8160,18 +5263,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8191,15 +5287,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -8208,17 +5296,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8238,9 +5319,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -8251,7 +5332,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -8262,16 +5343,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -8288,17 +5362,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8318,17 +5385,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8348,9 +5408,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -8361,7 +5421,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -8372,17 +5432,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8402,15 +5455,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -8426,17 +5471,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8456,18 +5494,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8487,19 +5518,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -8516,16 +5537,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -8538,17 +5550,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8568,17 +5573,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8598,15 +5596,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -8616,17 +5606,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -8647,17 +5630,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8677,20 +5653,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8710,20 +5676,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8743,20 +5699,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8776,20 +5722,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8809,18 +5745,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -8839,10 +5764,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -8853,17 +5775,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8883,20 +5798,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8916,20 +5821,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8949,20 +5844,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8982,20 +5867,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9015,17 +5890,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9045,19 +5913,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9074,17 +5932,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9104,17 +5955,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9134,17 +5978,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9164,18 +6001,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9195,17 +6025,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9225,17 +6048,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9255,19 +6071,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -9283,19 +6087,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9312,17 +6106,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9342,17 +6129,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9372,17 +6152,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9402,17 +6175,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9432,19 +6198,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9461,19 +6217,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9490,16 +6236,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9516,17 +6255,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9546,17 +6278,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9576,17 +6301,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9606,16 +6324,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9632,17 +6343,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9662,19 +6366,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9691,19 +6385,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9720,18 +6404,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -9744,19 +6417,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9773,17 +6436,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9803,17 +6459,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9833,17 +6482,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9863,17 +6505,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9893,16 +6528,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9919,17 +6547,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -9949,18 +6570,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/include-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -9970,16 +6580,9 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/include-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -9996,16 +6599,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/include-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -10013,18 +6607,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/exclude-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -10034,16 +6617,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/exclude-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -10060,16 +6636,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/exclude-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -10077,17 +6644,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-profile/group/title"
-             _metaschema-json-id="/assembly/oscal-profile/group/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10107,17 +6667,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10137,17 +6690,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10167,18 +6713,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10198,18 +6737,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10229,15 +6761,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -10246,17 +6770,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10276,9 +6793,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -10289,7 +6806,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -10300,16 +6817,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -10326,17 +6836,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10356,17 +6859,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10386,9 +6882,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -10399,7 +6895,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -10410,17 +6906,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10440,18 +6929,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/include-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -10461,16 +6939,9 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/include-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -10487,16 +6958,7 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/include-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -10504,18 +6966,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -10525,16 +6976,9 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -10551,16 +6995,7 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -10568,18 +7003,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/include-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -10589,16 +7013,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/include-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -10615,16 +7032,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/include-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -10632,18 +7040,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/exclude-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -10653,16 +7050,9 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/exclude-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -10679,16 +7069,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/exclude-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -10696,15 +7077,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter" -->
-      <assembly _step="set-parameter"
-                _key="set-parameters"
-                _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter"
-                _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters"
-                name="set-parameter"
-                _using-name="set-parameter"
-                _in-xml-name="set-parameter"
-                _in-json-name="set-parameters"
-                gi="set-parameter">
+      <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="*[@key='param-id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='depends-on']"/>
@@ -10722,17 +7095,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10752,17 +7118,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/label"
-             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10782,18 +7141,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/usage"
-             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10813,18 +7165,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10844,15 +7189,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -10861,17 +7198,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10891,9 +7221,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -10904,7 +7234,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -10915,16 +7245,9 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -10941,17 +7264,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-profile/add/title"
-             _metaschema-json-id="/assembly/oscal-profile/add/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -10971,17 +7287,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11001,17 +7310,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11031,18 +7333,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11062,18 +7357,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11093,15 +7381,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -11110,17 +7390,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11140,9 +7413,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -11153,7 +7426,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -11164,16 +7437,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -11190,17 +7456,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11220,17 +7479,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11250,9 +7502,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -11263,7 +7515,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -11274,17 +7526,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11304,15 +7549,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -11328,17 +7565,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11358,18 +7588,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11389,19 +7612,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -11418,16 +7631,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -11440,17 +7644,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11470,17 +7667,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11500,15 +7690,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -11518,17 +7700,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -11549,17 +7724,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11579,20 +7747,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11612,20 +7770,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11645,20 +7793,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11678,20 +7816,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11711,18 +7839,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -11741,10 +7858,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -11755,17 +7869,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11785,20 +7892,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11818,20 +7915,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11851,20 +7938,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11884,20 +7961,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11917,17 +7984,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -11947,19 +8007,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -11976,17 +8026,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12006,17 +8049,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12036,17 +8072,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12066,18 +8095,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12097,17 +8119,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12127,17 +8142,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12157,19 +8165,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -12185,19 +8181,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -12214,17 +8200,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12244,17 +8223,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12274,17 +8246,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12304,17 +8269,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12334,19 +8292,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -12363,19 +8311,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -12392,16 +8330,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -12418,17 +8349,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12448,17 +8372,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12478,17 +8395,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12508,16 +8418,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -12534,17 +8437,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12564,19 +8460,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -12593,19 +8479,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -12622,18 +8498,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -12646,19 +8511,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -12675,17 +8530,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12705,17 +8553,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12735,17 +8576,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12765,17 +8599,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12795,16 +8622,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -12821,17 +8641,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12851,17 +8664,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/title"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12881,18 +8687,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12912,17 +8711,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/purpose"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12942,17 +8734,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -12972,17 +8757,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13002,17 +8780,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13032,18 +8803,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:control-implementation"
-                _step="control-implementation"
-                _key="control-implementations"
-                _key-ref="oscal-component-definition:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementations"
-                gi="control-implementation">
+      <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='source']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -13057,18 +8817,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13088,17 +8841,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13118,16 +8864,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -13144,18 +8883,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-component-definition:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -13171,18 +8899,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13202,17 +8923,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13232,16 +8946,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -13258,17 +8965,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13288,18 +8988,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-component-definition:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="*[@key='statement-id']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -13313,18 +9002,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/statement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/statement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13344,17 +9026,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13374,17 +9049,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13404,18 +9072,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/capability/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/capability/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13435,17 +9096,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13465,18 +9119,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/incorporates-component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/incorporates-component/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/incorporates-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13496,18 +9143,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:control-implementation"
-                _step="control-implementation"
-                _key="control-implementations"
-                _key-ref="oscal-component-definition:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementations"
-                gi="control-implementation">
+      <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='source']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -13521,18 +9157,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13552,17 +9181,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13582,16 +9204,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -13608,18 +9223,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-component-definition:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -13635,18 +9239,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13666,17 +9263,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13696,16 +9286,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -13722,17 +9305,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13752,18 +9328,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-component-definition:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="*[@key='statement-id']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -13777,18 +9342,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/statement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/statement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13808,17 +9366,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13838,17 +9389,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13868,15 +9412,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -13892,17 +9428,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13922,18 +9451,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -13953,19 +9475,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -13982,16 +9494,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -14004,17 +9507,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14034,17 +9530,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14064,15 +9553,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -14082,17 +9563,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -14113,17 +9587,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14143,20 +9610,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14176,20 +9633,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14209,20 +9656,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14242,20 +9679,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14275,18 +9702,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -14305,10 +9721,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -14319,17 +9732,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14349,20 +9755,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14382,20 +9778,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14415,20 +9801,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14448,20 +9824,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14481,17 +9847,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14511,19 +9870,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -14540,17 +9889,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14570,17 +9912,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14600,17 +9935,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14630,18 +9958,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14661,17 +9982,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14691,17 +10005,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14721,19 +10028,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -14749,19 +10044,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -14778,17 +10063,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14808,17 +10086,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14838,17 +10109,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14868,17 +10132,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -14898,19 +10155,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -14927,19 +10174,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -14956,16 +10193,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -14982,17 +10212,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15012,17 +10235,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15042,17 +10258,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15072,16 +10281,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -15098,17 +10300,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15128,19 +10323,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -15157,19 +10342,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -15186,18 +10361,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -15210,19 +10374,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -15239,17 +10393,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15269,17 +10416,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15299,17 +10439,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15329,17 +10462,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15359,16 +10485,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -15385,17 +10504,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15415,17 +10527,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-name" -->
-      <field _step="system-name"
-             _key="system-name"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-name"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-name"
              key="system-name"
-             _using-name="system-name"
-             _in-xml-name="system-name"
-             _in-json-name="system-name"
              gi="system-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15445,17 +10550,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-name-short" -->
-      <field _step="system-name-short"
-             _key="system-name-short"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-name-short"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-name-short"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-name-short"
              key="system-name-short"
-             _using-name="system-name-short"
-             _in-xml-name="system-name-short"
-             _in-json-name="system-name-short"
              gi="system-name-short"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15475,18 +10573,11 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/description"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15506,17 +10597,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15536,20 +10620,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/date-authorized" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/date-authorized"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/date-authorized"
-             collapsible="no"
+      <field collapsible="no"
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _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"
-             _key-ref="oscal-ssp:date-authorized"
-             _using-name="date-authorized"
-             _in-xml-name="date-authorized"
-             _in-json-name="date-authorized"
              gi="date-authorized"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15569,17 +10643,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-sensitivity-level" -->
-      <field _step="security-sensitivity-level"
-             _key="security-sensitivity-level"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/security-sensitivity-level"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-sensitivity-level"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-sensitivity-level"
              key="security-sensitivity-level"
-             _using-name="security-sensitivity-level"
-             _in-xml-name="security-sensitivity-level"
-             _in-json-name="security-sensitivity-level"
              gi="security-sensitivity-level"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15599,17 +10666,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15629,15 +10689,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type" -->
-      <assembly _step="information-type"
-                _key="information-types"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types"
-                name="information-type"
-                _using-name="information-type"
-                _in-xml-name="information-type"
-                _in-json-name="information-types"
-                gi="information-type">
+      <assembly name="information-type" gi="information-type">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -15653,17 +10705,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/title"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15683,18 +10728,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/description"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15714,15 +10752,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization" -->
-      <assembly _step="categorization"
-                _key="categorizations"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations"
-                name="categorization"
-                _using-name="categorization"
-                _in-xml-name="categorization"
-                _in-json-name="categorizations"
-                gi="categorization">
+      <assembly name="categorization" gi="categorization">
          <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='information-type-ids']"/>
       </assembly>
@@ -15731,16 +10761,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/information-type-id" -->
-      <field _step="information-type-id"
-             _key="information-type-ids"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization/information-type-id"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations/information-type-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="information-type-id"
-             _using-name="information-type-id"
-             _in-xml-name="information-type-id"
-             _in-json-name="information-type-ids"
              gi="information-type-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -15757,17 +10780,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15787,15 +10803,8 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact" -->
-      <assembly _step="confidentiality-impact"
-                _key="confidentiality-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact"
-                name="confidentiality-impact"
+      <assembly name="confidentiality-impact"
                 key="confidentiality-impact"
-                _using-name="confidentiality-impact"
-                _in-xml-name="confidentiality-impact"
-                _in-json-name="confidentiality-impact"
                 gi="confidentiality-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
@@ -15811,17 +10820,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15841,20 +10843,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/base" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15874,20 +10866,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/selected" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15907,21 +10889,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15941,15 +10913,8 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact" -->
-      <assembly _step="integrity-impact"
-                _key="integrity-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact"
-                name="integrity-impact"
+      <assembly name="integrity-impact"
                 key="integrity-impact"
-                _using-name="integrity-impact"
-                _in-xml-name="integrity-impact"
-                _in-json-name="integrity-impact"
                 gi="integrity-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">integrity-impact</xsl:attribute>
@@ -15965,17 +10930,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -15995,20 +10953,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/base" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16028,20 +10976,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/selected" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16061,21 +10999,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16095,15 +11023,8 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact" -->
-      <assembly _step="availability-impact"
-                _key="availability-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact"
-                name="availability-impact"
+      <assembly name="availability-impact"
                 key="availability-impact"
-                _using-name="availability-impact"
-                _in-xml-name="availability-impact"
-                _in-json-name="availability-impact"
                 gi="availability-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">availability-impact</xsl:attribute>
@@ -16119,17 +11040,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16149,20 +11063,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/base" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16182,20 +11086,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/selected" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16215,21 +11109,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/adjustment-justification" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16249,17 +11133,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-confidentiality" -->
-      <field _step="security-objective-confidentiality"
-             _key="security-objective-confidentiality"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-confidentiality"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-confidentiality"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-confidentiality"
              key="security-objective-confidentiality"
-             _using-name="security-objective-confidentiality"
-             _in-xml-name="security-objective-confidentiality"
-             _in-json-name="security-objective-confidentiality"
              gi="security-objective-confidentiality"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16279,17 +11156,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-integrity" -->
-      <field _step="security-objective-integrity"
-             _key="security-objective-integrity"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-integrity"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-integrity"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-integrity"
              key="security-objective-integrity"
-             _using-name="security-objective-integrity"
-             _in-xml-name="security-objective-integrity"
-             _in-json-name="security-objective-integrity"
              gi="security-objective-integrity"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16309,17 +11179,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-availability" -->
-      <field _step="security-objective-availability"
-             _key="security-objective-availability"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-availability"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-availability"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-availability"
              key="security-objective-availability"
-             _using-name="security-objective-availability"
-             _in-xml-name="security-objective-availability"
-             _in-json-name="security-objective-availability"
              gi="security-objective-availability"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16339,19 +11202,7 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/status" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/status"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:status"
-                _step="status"
-                _key="status"
-                _key-ref="oscal-ssp:status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -16363,18 +11214,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/description"
-             _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16394,17 +11238,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16424,18 +11261,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16455,17 +11285,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16485,17 +11308,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/caption" -->
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16515,18 +11331,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/remarks" -->
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16546,18 +11355,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/remarks" -->
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16577,18 +11379,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/network-architecture/description"
-             _metaschema-json-id="/assembly/oscal-ssp/network-architecture/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16608,17 +11403,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16638,18 +11426,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16669,17 +11450,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16699,17 +11473,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/caption" -->
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16729,18 +11496,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/remarks" -->
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16760,18 +11520,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/data-flow/description"
-             _metaschema-json-id="/assembly/oscal-ssp/data-flow/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16791,17 +11544,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16821,18 +11567,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16852,17 +11591,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16882,17 +11614,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/caption" -->
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16912,18 +11637,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/remarks" -->
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16943,17 +11661,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -16973,17 +11684,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17003,15 +11707,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization" -->
-      <assembly _step="leveraged-authorization"
-                _key="leveraged-authorizations"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization"
-                _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations"
-                name="leveraged-authorization"
-                _using-name="leveraged-authorization"
-                _in-xml-name="leveraged-authorization"
-                _in-json-name="leveraged-authorizations"
-                gi="leveraged-authorization">
+      <assembly name="leveraged-authorization" gi="leveraged-authorization">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -17025,17 +11721,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/title"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17055,17 +11744,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17085,17 +11767,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/party-uuid" -->
-      <field _step="party-uuid"
-             _key="party-uuid"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/party-uuid"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/party-uuid"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
              key="party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuid"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17115,20 +11790,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/date-authorized" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/date-authorized"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/date-authorized"
-             collapsible="no"
+      <field collapsible="no"
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _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"
-             _key-ref="oscal-ssp:date-authorized"
-             _using-name="date-authorized"
-             _in-xml-name="date-authorized"
-             _in-json-name="date-authorized"
              gi="date-authorized"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17148,17 +11813,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17178,17 +11836,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17208,18 +11859,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17239,17 +11883,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17269,17 +11906,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/authorized-privilege/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17299,18 +11929,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/authorized-privilege/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17330,17 +11953,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17360,18 +11976,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17391,17 +12000,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17421,17 +12023,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17451,16 +12046,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -17472,17 +12058,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17502,17 +12081,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17532,18 +12104,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17563,17 +12128,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17593,17 +12151,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17623,15 +12174,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component" -->
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -17643,17 +12186,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17673,17 +12209,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17703,18 +12232,8 @@
                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
-                name="control-implementation"
+      <assembly name="control-implementation"
                 key="control-implementation"
-                _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"
-                _key-ref="oscal-ssp:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementation"
                 gi="control-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">control-implementation</xsl:attribute>
@@ -17728,18 +12247,11 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-ssp/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17759,16 +12271,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -17785,18 +12290,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement" -->
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-ssp:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -17812,17 +12306,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17842,16 +12329,9 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -17868,17 +12348,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17898,18 +12371,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement" -->
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-ssp:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="*[@key='statement-id']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -17923,17 +12385,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17953,17 +12408,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -17983,18 +12431,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18014,17 +12455,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18044,16 +12478,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -18070,16 +12497,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export" -->
-      <assembly _step="export"
-                _key="export"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export"
-                name="export"
-                key="export"
-                _using-name="export"
-                _in-xml-name="export"
-                _in-json-name="export"
-                gi="export">
+      <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">export</xsl:attribute>
          </xsl:if>
@@ -18095,18 +12513,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18126,17 +12537,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18156,15 +12560,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided" -->
-      <assembly _step="provided"
-                _key="provided"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided"
-                name="provided"
-                _using-name="provided"
-                _in-xml-name="provided"
-                _in-json-name="provided"
-                gi="provided">
+      <assembly name="provided" gi="provided">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -18177,18 +12573,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18208,17 +12597,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18238,17 +12620,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18268,15 +12643,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility" -->
-      <assembly _step="responsibility"
-                _key="responsibilities"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities"
-                name="responsibility"
-                _using-name="responsibility"
-                _in-xml-name="responsibility"
-                _in-json-name="responsibilities"
-                gi="responsibility">
+      <assembly name="responsibility" gi="responsibility">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='provided-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -18290,18 +12657,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18321,17 +12681,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18351,17 +12704,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18381,15 +12727,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited" -->
-      <assembly _step="inherited"
-                _key="inherited"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited"
-                name="inherited"
-                _using-name="inherited"
-                _in-xml-name="inherited"
-                _in-json-name="inherited"
-                gi="inherited">
+      <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='provided-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -18402,18 +12740,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18433,17 +12764,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18463,17 +12787,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18493,15 +12810,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied" -->
-      <assembly _step="satisfied"
-                _key="satisfied"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied"
-                name="satisfied"
-                _using-name="satisfied"
-                _in-xml-name="satisfied"
-                _in-json-name="satisfied"
-                gi="satisfied">
+      <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='responsibility-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -18515,18 +12824,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18546,17 +12848,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18576,17 +12871,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18606,17 +12894,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18636,18 +12917,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18667,17 +12941,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18697,16 +12964,9 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -18723,16 +12983,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export" -->
-      <assembly _step="export"
-                _key="export"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export"
-                name="export"
-                key="export"
-                _using-name="export"
-                _in-xml-name="export"
-                _in-json-name="export"
-                gi="export">
+      <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">export</xsl:attribute>
          </xsl:if>
@@ -18748,18 +12999,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18779,17 +13023,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18809,15 +13046,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided" -->
-      <assembly _step="provided"
-                _key="provided"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided"
-                name="provided"
-                _using-name="provided"
-                _in-xml-name="provided"
-                _in-json-name="provided"
-                gi="provided">
+      <assembly name="provided" gi="provided">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -18830,18 +13059,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18861,17 +13083,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18891,17 +13106,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18921,15 +13129,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility" -->
-      <assembly _step="responsibility"
-                _key="responsibilities"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities"
-                name="responsibility"
-                _using-name="responsibility"
-                _in-xml-name="responsibility"
-                _in-json-name="responsibilities"
-                gi="responsibility">
+      <assembly name="responsibility" gi="responsibility">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='provided-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -18943,18 +13143,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -18974,17 +13167,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19004,17 +13190,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19034,15 +13213,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited" -->
-      <assembly _step="inherited"
-                _key="inherited"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited"
-                name="inherited"
-                _using-name="inherited"
-                _in-xml-name="inherited"
-                _in-json-name="inherited"
-                gi="inherited">
+      <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='provided-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -19055,18 +13226,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19086,17 +13250,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19116,17 +13273,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19146,15 +13296,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied" -->
-      <assembly _step="satisfied"
-                _key="satisfied"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied"
-                name="satisfied"
-                _using-name="satisfied"
-                _in-xml-name="satisfied"
-                _in-json-name="satisfied"
-                gi="satisfied">
+      <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='responsibility-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -19168,18 +13310,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19199,17 +13334,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19229,17 +13357,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19259,17 +13380,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19289,15 +13403,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -19313,17 +13419,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19343,18 +13442,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19374,19 +13466,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -19403,16 +13485,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -19425,17 +13498,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19455,17 +13521,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19485,15 +13544,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -19503,17 +13554,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -19534,17 +13578,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19564,20 +13601,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19597,20 +13624,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19630,20 +13647,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19663,20 +13670,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19696,18 +13693,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -19726,10 +13712,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -19740,17 +13723,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19770,20 +13746,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19803,20 +13769,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19836,20 +13792,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19869,20 +13815,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19902,17 +13838,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19932,19 +13861,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -19961,17 +13880,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -19991,17 +13903,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20021,17 +13926,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20051,18 +13949,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20082,17 +13973,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20112,17 +13996,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20142,19 +14019,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -20170,19 +14035,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -20199,17 +14054,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20229,17 +14077,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20259,17 +14100,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20289,17 +14123,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20319,19 +14146,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -20348,19 +14165,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -20377,16 +14184,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -20403,17 +14203,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20433,17 +14226,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20463,17 +14249,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20493,16 +14272,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -20519,17 +14291,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20549,19 +14314,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -20578,19 +14333,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -20607,18 +14352,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -20631,19 +14365,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -20660,17 +14384,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20690,17 +14407,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20720,17 +14430,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20750,17 +14453,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20780,16 +14476,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -20806,17 +14495,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20836,15 +14518,8 @@
                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions" -->
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -20861,17 +14536,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20891,18 +14559,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20922,17 +14583,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20952,17 +14606,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -20982,16 +14629,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -21003,17 +14641,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21033,17 +14664,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21063,18 +14687,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21094,17 +14711,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21124,17 +14734,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21154,15 +14757,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component" -->
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -21174,17 +14769,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21204,17 +14792,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21234,17 +14815,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21264,17 +14838,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21294,18 +14861,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21325,17 +14885,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21355,17 +14908,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/authorized-privilege/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21385,18 +14931,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/authorized-privilege/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21416,18 +14955,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21447,17 +14979,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21477,17 +15002,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21507,9 +15025,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -21520,7 +15038,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -21531,17 +15049,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21561,17 +15072,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21591,18 +15095,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21622,17 +15119,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21652,15 +15142,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step" -->
-      <assembly _step="step"
-                _key="steps"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps"
-                name="step"
-                _using-name="step"
-                _in-xml-name="step"
-                _in-json-name="steps"
-                gi="step">
+      <assembly name="step" gi="step">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -21675,17 +15157,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21705,18 +15180,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21736,17 +15204,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21766,18 +15227,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21797,17 +15251,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21827,15 +15274,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -21849,18 +15288,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21880,17 +15312,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -21911,15 +15336,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -21930,18 +15348,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -21950,16 +15357,9 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -21976,18 +15376,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -21996,16 +15385,9 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -22022,15 +15404,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -22044,18 +15418,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22075,17 +15442,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22106,15 +15466,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -22125,17 +15478,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22155,18 +15501,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22186,17 +15525,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22216,15 +15548,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -22238,18 +15562,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22269,17 +15586,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22300,15 +15610,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -22319,18 +15622,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -22339,16 +15631,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -22365,18 +15650,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -22385,16 +15659,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -22411,15 +15678,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -22433,18 +15692,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22464,17 +15716,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22495,15 +15740,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -22514,17 +15752,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22544,15 +15775,8 @@
                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/terms-and-conditions" -->
-      <assembly _step="terms-and-conditions"
-                _key="terms-and-conditions"
-                _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions"
-                _metaschema-json-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions"
-                name="terms-and-conditions"
+      <assembly name="terms-and-conditions"
                 key="terms-and-conditions"
-                _using-name="terms-and-conditions"
-                _in-xml-name="terms-and-conditions"
-                _in-json-name="terms-and-conditions"
                 gi="terms-and-conditions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">terms-and-conditions</xsl:attribute>
@@ -22564,17 +15788,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/terms-and-conditions//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22594,9 +15811,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -22607,7 +15824,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -22618,17 +15835,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/terms-and-conditions//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22648,18 +15858,11 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22679,17 +15882,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22709,15 +15905,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -22731,18 +15919,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22762,17 +15943,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22793,15 +15967,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -22812,18 +15979,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -22832,16 +15988,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -22858,18 +16007,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -22878,16 +16016,9 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -22904,15 +16035,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -22926,18 +16049,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22957,17 +16073,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -22988,15 +16097,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -23007,18 +16109,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23038,17 +16133,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23069,15 +16157,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -23088,17 +16169,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23118,17 +16192,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23148,17 +16215,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23178,18 +16238,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23209,17 +16262,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23239,17 +16285,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23269,16 +16308,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -23290,17 +16320,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23320,17 +16343,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23350,15 +16366,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform" -->
-      <assembly _step="assessment-platform"
-                _key="assessment-platforms"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms"
-                name="assessment-platform"
-                _using-name="assessment-platform"
-                _in-xml-name="assessment-platform"
-                _in-json-name="assessment-platforms"
-                gi="assessment-platform">
+      <assembly name="assessment-platform" gi="assessment-platform">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -23371,17 +16379,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23401,17 +16402,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23431,15 +16425,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component" -->
-      <assembly _step="uses-component"
-                _key="uses-components"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components"
-                name="uses-component"
-                _using-name="uses-component"
-                _in-xml-name="uses-component"
-                _in-json-name="uses-components"
-                gi="uses-component">
+      <assembly name="uses-component" gi="uses-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -23451,17 +16437,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23481,17 +16460,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23511,17 +16483,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23541,18 +16506,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23572,17 +16530,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23602,16 +16553,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing" -->
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -23624,17 +16566,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing/on-date" -->
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -23646,15 +16578,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing/within-date-range" -->
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -23668,15 +16593,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing/at-frequency" -->
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -23689,15 +16607,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/dependency" -->
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -23706,15 +16616,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity" -->
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="*[@key='activity-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -23727,17 +16629,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23757,17 +16652,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23787,18 +16675,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23818,17 +16699,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23849,15 +16723,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -23868,17 +16735,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23898,17 +16758,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23928,18 +16781,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23959,17 +16805,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -23990,15 +16829,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -24009,17 +16841,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24039,17 +16864,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24069,17 +16887,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24099,15 +16910,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -24123,17 +16926,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24153,18 +16949,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24184,19 +16973,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -24213,16 +16992,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -24235,17 +17005,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24265,17 +17028,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24295,15 +17051,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -24313,17 +17061,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -24344,17 +17085,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24374,20 +17108,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24407,20 +17131,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24440,20 +17154,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24473,20 +17177,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24506,18 +17200,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -24536,10 +17219,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -24550,17 +17230,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24580,20 +17253,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24613,20 +17276,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24646,20 +17299,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24679,20 +17322,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24712,17 +17345,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24742,19 +17368,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -24771,17 +17387,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24801,17 +17410,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24831,17 +17433,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24861,18 +17456,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24892,17 +17480,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24922,17 +17503,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -24952,19 +17526,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -24980,19 +17542,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -25009,17 +17561,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25039,17 +17584,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25069,17 +17607,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25099,17 +17630,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25129,19 +17653,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -25158,19 +17672,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -25187,16 +17691,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -25213,17 +17710,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25243,17 +17733,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25273,17 +17756,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25303,16 +17779,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -25329,17 +17798,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25359,19 +17821,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -25388,19 +17840,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -25417,18 +17859,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -25441,19 +17872,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -25470,17 +17891,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25500,17 +17914,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25530,17 +17937,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25560,17 +17960,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25590,16 +17983,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -25616,17 +18002,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25646,15 +18025,8 @@
                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions" -->
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ar/assessment-results/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ar/assessment-results/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -25668,18 +18040,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25699,17 +18064,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25729,17 +18087,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25759,9 +18110,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -25772,7 +18123,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -25783,17 +18134,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25813,17 +18157,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25843,18 +18180,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25874,17 +18204,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25904,15 +18227,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step" -->
-      <assembly _step="step"
-                _key="steps"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step"
-                _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps"
-                name="step"
-                _using-name="step"
-                _in-xml-name="step"
-                _in-json-name="steps"
-                gi="step">
+      <assembly name="step" gi="step">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -25927,17 +18242,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25957,18 +18265,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -25988,17 +18289,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26018,18 +18312,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26049,17 +18336,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26079,15 +18359,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -26101,18 +18373,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26132,17 +18397,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26163,15 +18421,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -26182,18 +18433,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -26202,16 +18442,9 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -26228,18 +18461,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -26248,16 +18470,9 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -26274,15 +18489,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -26296,18 +18503,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26327,17 +18527,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26358,15 +18551,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -26377,17 +18563,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26407,18 +18586,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26438,17 +18610,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26468,15 +18633,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -26490,18 +18647,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26521,17 +18671,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26552,15 +18695,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -26571,18 +18707,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -26591,16 +18716,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -26617,18 +18735,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -26637,16 +18744,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -26663,15 +18763,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -26685,18 +18777,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26716,17 +18801,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26747,15 +18825,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -26766,17 +18837,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26796,17 +18860,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/result/title"
-             _metaschema-json-id="/assembly/oscal-ar/result/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26826,18 +18883,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/result/description"
-             _metaschema-json-id="/assembly/oscal-ar/result/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26857,17 +18907,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/start" -->
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-ar/result/start"
-             _metaschema-json-id="/assembly/oscal-ar/result/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26887,17 +18930,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/end" -->
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-ar/result/end"
-             _metaschema-json-id="/assembly/oscal-ar/result/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26917,17 +18953,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -26947,15 +18976,8 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions" -->
-      <assembly _step="local-definitions"
-                _key="local-definitions"
-                _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions"
-                _metaschema-json-id="/assembly/oscal-ar/result/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -26971,17 +18993,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27001,18 +19016,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27032,17 +19040,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27062,17 +19063,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27092,16 +19086,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -27113,17 +19098,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27143,17 +19121,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27173,18 +19144,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27204,17 +19168,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27234,17 +19191,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27264,15 +19214,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component" -->
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -27284,17 +19226,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27314,17 +19249,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27344,17 +19272,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27374,17 +19295,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27404,18 +19318,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27435,17 +19342,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27465,17 +19365,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/authorized-privilege/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27495,18 +19388,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/authorized-privilege/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27526,17 +19412,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27556,18 +19435,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27587,17 +19459,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27617,17 +19482,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27647,16 +19505,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -27668,17 +19517,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27698,17 +19540,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27728,15 +19563,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform" -->
-      <assembly _step="assessment-platform"
-                _key="assessment-platforms"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms"
-                name="assessment-platform"
-                _using-name="assessment-platform"
-                _in-xml-name="assessment-platform"
-                _in-json-name="assessment-platforms"
-                gi="assessment-platform">
+      <assembly name="assessment-platform" gi="assessment-platform">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -27749,17 +19576,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27779,17 +19599,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27809,15 +19622,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component" -->
-      <assembly _step="uses-component"
-                _key="uses-components"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platform/uses-component"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-assets/assessment-platforms/uses-components"
-                name="uses-component"
-                _using-name="uses-component"
-                _in-xml-name="uses-component"
-                _in-json-name="uses-components"
-                gi="uses-component">
+      <assembly name="uses-component" gi="uses-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -27829,17 +19634,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27859,17 +19657,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27889,17 +19680,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27919,18 +19703,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27950,17 +19727,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -27980,16 +19750,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing" -->
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -28002,17 +19763,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/on-date" -->
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -28024,15 +19775,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range" -->
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -28046,15 +19790,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency" -->
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -28067,15 +19804,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/dependency" -->
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -28084,15 +19813,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity" -->
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="*[@key='activity-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -28105,17 +19826,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28135,17 +19849,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28165,18 +19872,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28196,17 +19896,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28227,15 +19920,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -28246,17 +19932,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28276,17 +19955,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28306,18 +19978,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28337,17 +20002,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28368,15 +20026,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -28387,17 +20038,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28417,17 +20061,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28447,17 +20084,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28477,18 +20107,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28508,17 +20131,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28538,15 +20154,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection" -->
-      <assembly _step="control-selection"
-                _key="control-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections"
-                name="control-selection"
-                _using-name="control-selection"
-                _in-xml-name="control-selection"
-                _in-json-name="control-selections"
-                gi="control-selection">
+      <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -28560,18 +20168,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28591,17 +20192,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28622,15 +20216,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -28641,18 +20228,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="include-control"
-                _key="include-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="include-control"
-                _in-xml-name="include-control"
-                _in-json-name="include-controls"
-                gi="include-control">
+      <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -28661,16 +20237,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -28687,18 +20256,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/exclude-control" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-control-by-id"
-                _step="exclude-control"
-                _key="exclude-controls"
-                _key-ref="oscal-assessment-common:select-control-by-id"
-                _using-name="exclude-control"
-                _in-xml-name="exclude-control"
-                _in-json-name="exclude-controls"
-                gi="exclude-control">
+      <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
@@ -28707,16 +20265,9 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/exclude-control/statement-id" -->
-      <field _step="statement-id"
-             _key="statement-ids"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/select-control-by-id/statement-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/statement-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="statement-id"
-             _using-name="statement-id"
-             _in-xml-name="statement-id"
-             _in-json-name="statement-ids"
              gi="statement-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -28733,15 +20284,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection" -->
-      <assembly _step="control-objective-selection"
-                _key="control-objective-selections"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections"
-                name="control-objective-selection"
-                _using-name="control-objective-selection"
-                _in-xml-name="control-objective-selection"
-                _in-json-name="control-objective-selections"
-                gi="control-objective-selection">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -28755,18 +20298,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28786,17 +20322,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28817,15 +20346,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -28836,15 +20358,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation" -->
-      <assembly _step="attestation"
-                _key="attestations"
-                _metaschema-xml-id="/assembly/oscal-ar/result/attestation"
-                _metaschema-json-id="/assembly/oscal-ar/result/attestations"
-                name="attestation"
-                _using-name="attestation"
-                _in-xml-name="attestation"
-                _in-json-name="attestations"
-                gi="attestation">
+      <assembly name="attestation" gi="attestation">
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
          <xsl:apply-templates select="*[@key='parts']"/>
       </assembly>
@@ -28853,17 +20367,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28883,17 +20390,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28913,9 +20413,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -28926,7 +20426,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -28937,17 +20437,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -28967,16 +20460,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log" -->
-      <assembly _step="assessment-log"
-                _key="assessment-log"
-                _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log"
-                _metaschema-json-id="/assembly/oscal-ar/result/assessment-log"
-                name="assessment-log"
-                key="assessment-log"
-                _using-name="assessment-log"
-                _in-xml-name="assessment-log"
-                _in-json-name="assessment-log"
-                gi="assessment-log">
+      <assembly name="assessment-log" key="assessment-log" gi="assessment-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-log</xsl:attribute>
          </xsl:if>
@@ -28987,15 +20471,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry" -->
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry"
-                _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -29012,17 +20488,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29042,18 +20511,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29073,17 +20535,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/start" -->
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29103,17 +20558,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/end" -->
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29133,17 +20581,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29163,17 +20604,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29193,17 +20627,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29223,18 +20650,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29254,17 +20674,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29285,15 +20698,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -29304,17 +20710,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29334,17 +20733,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29364,15 +20756,8 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -29385,18 +20770,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29416,17 +20794,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29447,15 +20818,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -29466,17 +20830,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29496,17 +20853,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29526,17 +20876,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29556,18 +20899,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29587,17 +20923,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29617,16 +20946,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/method" -->
-      <field _step="method"
-             _key="methods"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/method"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/methods"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="method"
-             _using-name="method"
-             _in-xml-name="method"
-             _in-json-name="methods"
              gi="method"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -29643,16 +20965,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/type" -->
-      <field _step="type"
-             _key="types"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/type"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/types"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="type"
-             _using-name="type"
-             _in-xml-name="type"
-             _in-json-name="types"
              gi="type"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -29669,17 +20984,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29699,17 +21007,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29729,17 +21030,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29759,18 +21053,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29790,17 +21077,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29821,15 +21101,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -29840,17 +21113,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29870,17 +21136,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29900,15 +21159,8 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -29921,18 +21173,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29952,17 +21197,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -29983,15 +21221,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -30002,17 +21233,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30032,17 +21256,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30062,18 +21279,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -30086,17 +21292,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30116,17 +21315,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30146,15 +21338,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/relevant-evidence" -->
-      <assembly _step="relevant-evidence"
-                _key="relevant-evidence"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                name="relevant-evidence"
-                _using-name="relevant-evidence"
-                _in-xml-name="relevant-evidence"
-                _in-json-name="relevant-evidence"
-                gi="relevant-evidence">
+      <assembly name="relevant-evidence" gi="relevant-evidence">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -30166,18 +21350,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/relevant-evidence/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30197,17 +21374,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/relevant-evidence/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30227,17 +21397,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/collected" -->
-      <field _step="collected"
-             _key="collected"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/collected"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/collected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="collected"
              key="collected"
-             _using-name="collected"
-             _in-xml-name="collected"
-             _in-json-name="collected"
              gi="collected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30257,17 +21420,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/expires" -->
-      <field _step="expires"
-             _key="expires"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/expires"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/expires"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="expires"
              key="expires"
-             _using-name="expires"
-             _in-xml-name="expires"
-             _in-json-name="expires"
              gi="expires"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30287,17 +21443,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30317,18 +21466,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30348,18 +21490,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/statement" -->
-      <field _step="statement"
-             _key="statement"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/statement"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/statement"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="statement"
              key="statement"
-             _using-name="statement"
-             _in-xml-name="statement"
-             _in-json-name="statement"
              gi="statement"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30379,17 +21514,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30409,17 +21537,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/status" -->
-      <field _step="status"
-             _key="status"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/status"
-             collapsible="no"
+      <field 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">
          <xsl:if test="$with-key">
@@ -30439,17 +21560,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30469,17 +21583,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30499,17 +21606,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30529,18 +21629,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30560,17 +21653,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30591,15 +21677,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -30610,17 +21689,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30640,17 +21712,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30670,15 +21735,8 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -30691,18 +21749,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30722,17 +21773,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30753,15 +21797,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -30772,17 +21809,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30802,17 +21832,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30832,17 +21855,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30862,17 +21878,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30892,17 +21901,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30922,17 +21924,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30952,18 +21947,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -30983,17 +21971,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31014,15 +21995,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -31033,17 +22007,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31063,17 +22030,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31093,15 +22053,8 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -31114,18 +22067,11 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31145,17 +22091,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31176,15 +22115,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -31195,17 +22127,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31225,17 +22150,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31255,15 +22173,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/facet" -->
-      <assembly _step="facet"
-                _key="facets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet"
-                _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets"
-                name="facet"
-                _using-name="facet"
-                _in-xml-name="facet"
-                _in-json-name="facets"
-                gi="facet">
+      <assembly name="facet" gi="facet">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='value']"/>
@@ -31276,17 +22186,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/facet/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31306,15 +22209,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor" -->
-      <assembly _step="mitigating-factor"
-                _key="mitigating-factors"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors"
-                name="mitigating-factor"
-                _using-name="mitigating-factor"
-                _in-xml-name="mitigating-factor"
-                _in-json-name="mitigating-factors"
-                gi="mitigating-factor">
+      <assembly name="mitigating-factor" gi="mitigating-factor">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='implementation-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -31327,18 +22222,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31358,17 +22246,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31388,18 +22269,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -31412,17 +22282,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31442,17 +22305,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31472,17 +22328,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/deadline" -->
-      <field _step="deadline"
-             _key="deadline"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/deadline"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/deadline"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="deadline"
              key="deadline"
-             _using-name="deadline"
-             _in-xml-name="deadline"
-             _in-json-name="deadline"
              gi="deadline"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31502,18 +22351,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:response"
-                _step="response"
-                _key="remediations"
-                _key-ref="oscal-assessment-common:response"
-                _using-name="response"
-                _in-xml-name="response"
-                _in-json-name="remediations"
-                gi="response">
+      <assembly name="response" gi="response">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='lifecycle']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -31530,17 +22368,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31560,18 +22391,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31591,17 +22415,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31621,17 +22438,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31651,17 +22461,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31681,17 +22484,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31711,18 +22507,11 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31742,17 +22531,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31773,15 +22555,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -31792,17 +22567,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31822,17 +22590,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31852,15 +22613,8 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -31873,18 +22627,11 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31904,17 +22651,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31935,15 +22675,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -31954,17 +22687,10 @@
                  priority="21">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -31984,17 +22710,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32014,15 +22733,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset" -->
-      <assembly _step="required-asset"
-                _key="required-assets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset"
-                _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets"
-                name="required-asset"
-                _using-name="required-asset"
-                _in-xml-name="required-asset"
-                _in-json-name="required-assets"
-                gi="required-asset">
+      <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='subjects']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -32036,18 +22747,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -32060,17 +22760,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32090,17 +22783,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32120,17 +22806,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32150,18 +22829,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32181,17 +22853,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32211,17 +22876,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32241,18 +22899,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32272,17 +22923,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32302,16 +22946,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing" -->
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -32324,17 +22959,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing/on-date" -->
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -32346,15 +22971,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing/within-date-range" -->
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -32368,15 +22986,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing/at-frequency" -->
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -32389,15 +23000,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/dependency" -->
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -32406,15 +23009,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity" -->
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="*[@key='activity-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -32427,17 +23022,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32457,17 +23045,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32487,18 +23068,11 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32518,17 +23092,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32549,15 +23116,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -32568,17 +23128,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32598,17 +23151,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32628,18 +23174,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32659,17 +23198,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32690,15 +23222,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -32709,17 +23234,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32739,17 +23257,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32769,17 +23280,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32799,16 +23303,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log" -->
-      <assembly _step="risk-log"
-                _key="risk-log"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log"
-                name="risk-log"
-                key="risk-log"
-                _using-name="risk-log"
-                _in-xml-name="risk-log"
-                _in-json-name="risk-log"
-                gi="risk-log">
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">risk-log</xsl:attribute>
          </xsl:if>
@@ -32819,15 +23314,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry" -->
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -32845,17 +23332,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32875,18 +23355,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32906,17 +23379,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/start" -->
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32936,17 +23402,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/end" -->
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32966,17 +23425,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -32996,15 +23448,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response" -->
-      <assembly _step="related-response"
-                _key="related-responses"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses"
-                name="related-response"
-                _using-name="related-response"
-                _in-xml-name="related-response"
-                _in-json-name="related-responses"
-                gi="related-response">
+      <assembly name="related-response" gi="related-response">
          <xsl:apply-templates select="*[@key='response-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -33016,17 +23460,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33046,17 +23483,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33076,17 +23506,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33106,18 +23529,11 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33137,17 +23553,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33168,15 +23577,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -33187,17 +23589,10 @@
                  priority="21">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33217,17 +23612,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33247,15 +23635,8 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -33268,18 +23649,11 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33299,17 +23673,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33330,15 +23697,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -33349,17 +23709,10 @@
                  priority="22">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33379,17 +23732,10 @@
                  priority="21">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33409,16 +23755,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/related-observation" -->
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
@@ -33426,17 +23763,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/title"
-             _metaschema-json-id="/assembly/oscal-ar/finding/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33456,18 +23786,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/description"
-             _metaschema-json-id="/assembly/oscal-ar/finding/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33487,17 +23810,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33517,17 +23833,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33547,17 +23856,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33577,17 +23879,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33607,18 +23902,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33638,17 +23926,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33669,15 +23950,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -33688,17 +23962,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33718,17 +23985,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33748,15 +24008,8 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -33769,18 +24022,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33800,17 +24046,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33831,15 +24070,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -33850,17 +24082,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33880,17 +24105,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33910,17 +24128,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33940,18 +24151,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -33971,17 +24175,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34001,16 +24198,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/status" -->
-      <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">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -34023,17 +24211,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/implementation-statement-uuid" -->
-      <field _step="implementation-statement-uuid"
-             _key="implementation-statement-uuid"
-             _metaschema-xml-id="/assembly/oscal-ar/finding/implementation-statement-uuid"
-             _metaschema-json-id="/assembly/oscal-ar/finding/implementation-statement-uuid"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="implementation-statement-uuid"
              key="implementation-statement-uuid"
-             _using-name="implementation-statement-uuid"
-             _in-xml-name="implementation-statement-uuid"
-             _in-json-name="implementation-statement-uuid"
              gi="implementation-statement-uuid"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34053,16 +24234,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/related-observation" -->
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-ar/finding/related-observation"
-                _metaschema-json-id="/assembly/oscal-ar/finding/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
@@ -34070,16 +24242,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/associated-risk" -->
-      <assembly as-type="empty"
-                _step="associated-risk"
-                _key="related-risks"
-                _metaschema-xml-id="/assembly/oscal-ar/finding/associated-risk"
-                _metaschema-json-id="/assembly/oscal-ar/finding/related-risks"
-                name="associated-risk"
-                _using-name="associated-risk"
-                _in-xml-name="associated-risk"
-                _in-json-name="related-risks"
-                gi="associated-risk">
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="*[@key='risk-uuid']"/>
       </assembly>
    </xsl:template>
@@ -34087,15 +24250,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -34111,17 +24266,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34141,18 +24289,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34172,19 +24313,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -34201,16 +24332,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -34223,17 +24345,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34253,17 +24368,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34283,15 +24391,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -34301,17 +24401,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -34332,17 +24425,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34362,20 +24448,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34395,20 +24471,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34428,20 +24494,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34461,20 +24517,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34494,18 +24540,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -34524,10 +24559,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -34538,17 +24570,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34568,20 +24593,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34601,20 +24616,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34634,20 +24639,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34667,20 +24662,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34700,17 +24685,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34730,19 +24708,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -34759,17 +24727,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34789,17 +24750,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34819,17 +24773,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34849,18 +24796,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34880,17 +24820,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34910,17 +24843,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -34940,19 +24866,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -34968,19 +24882,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -34997,17 +24901,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35027,17 +24924,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35057,17 +24947,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35087,17 +24970,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35117,19 +24993,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -35146,19 +25012,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -35175,16 +25031,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -35201,17 +25050,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35231,17 +25073,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35261,17 +25096,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35291,16 +25119,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -35317,17 +25138,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35347,19 +25161,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -35376,19 +25180,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -35405,18 +25199,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -35429,19 +25212,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -35458,17 +25231,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35488,17 +25254,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35518,17 +25277,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35548,17 +25300,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35578,16 +25323,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -35604,17 +25342,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35634,17 +25365,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35664,18 +25388,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35695,17 +25412,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35725,17 +25435,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35755,16 +25458,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -35776,17 +25470,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35806,17 +25493,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35836,18 +25516,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35867,17 +25540,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35897,17 +25563,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35927,15 +25586,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component" -->
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -35947,17 +25598,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -35977,17 +25621,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36007,17 +25644,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36037,18 +25667,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36068,17 +25691,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36098,16 +25714,9 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/method" -->
-      <field _step="method"
-             _key="methods"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/method"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/methods"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="method"
-             _using-name="method"
-             _in-xml-name="method"
-             _in-json-name="methods"
              gi="method"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -36124,16 +25733,9 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/type" -->
-      <field _step="type"
-             _key="types"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/type"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/types"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="type"
-             _using-name="type"
-             _in-xml-name="type"
-             _in-json-name="types"
              gi="type"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -36150,17 +25752,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36180,17 +25775,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36210,17 +25798,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36240,18 +25821,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36271,17 +25845,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36302,15 +25869,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -36321,17 +25881,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36351,17 +25904,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36381,15 +25927,8 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -36402,18 +25941,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36433,17 +25965,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36464,15 +25989,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -36483,17 +26001,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36513,17 +26024,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36543,18 +26047,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -36567,17 +26060,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36597,17 +26083,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36627,15 +26106,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence" -->
-      <assembly _step="relevant-evidence"
-                _key="relevant-evidence"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                name="relevant-evidence"
-                _using-name="relevant-evidence"
-                _in-xml-name="relevant-evidence"
-                _in-json-name="relevant-evidence"
-                gi="relevant-evidence">
+      <assembly name="relevant-evidence" gi="relevant-evidence">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -36647,18 +26118,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36678,17 +26142,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36708,17 +26165,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/collected" -->
-      <field _step="collected"
-             _key="collected"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/collected"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/collected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="collected"
              key="collected"
-             _using-name="collected"
-             _in-xml-name="collected"
-             _in-json-name="collected"
              gi="collected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36738,17 +26188,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/expires" -->
-      <field _step="expires"
-             _key="expires"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/expires"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/expires"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="expires"
              key="expires"
-             _using-name="expires"
-             _in-xml-name="expires"
-             _in-json-name="expires"
              gi="expires"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36768,17 +26211,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36798,18 +26234,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36829,18 +26258,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/statement" -->
-      <field _step="statement"
-             _key="statement"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/statement"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/statement"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="statement"
              key="statement"
-             _using-name="statement"
-             _in-xml-name="statement"
-             _in-json-name="statement"
              gi="statement"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36860,17 +26282,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36890,17 +26305,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/status" -->
-      <field _step="status"
-             _key="status"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/status"
-             collapsible="no"
+      <field 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">
          <xsl:if test="$with-key">
@@ -36920,17 +26328,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36950,17 +26351,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -36980,17 +26374,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37010,18 +26397,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37041,17 +26421,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37072,15 +26445,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -37091,17 +26457,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37121,17 +26480,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37151,15 +26503,8 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -37172,18 +26517,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37203,17 +26541,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37234,15 +26565,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -37253,17 +26577,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37283,17 +26600,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37313,17 +26623,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37343,17 +26646,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37373,17 +26669,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37403,17 +26692,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37433,18 +26715,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37464,17 +26739,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37495,15 +26763,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -37514,17 +26775,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37544,17 +26798,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37574,15 +26821,8 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -37595,18 +26835,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37626,17 +26859,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37657,15 +26883,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -37676,17 +26895,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37706,17 +26918,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37736,15 +26941,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/facet" -->
-      <assembly _step="facet"
-                _key="facets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet"
-                _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets"
-                name="facet"
-                _using-name="facet"
-                _in-xml-name="facet"
-                _in-json-name="facets"
-                gi="facet">
+      <assembly name="facet" gi="facet">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='value']"/>
@@ -37757,17 +26954,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37787,15 +26977,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor" -->
-      <assembly _step="mitigating-factor"
-                _key="mitigating-factors"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors"
-                name="mitigating-factor"
-                _using-name="mitigating-factor"
-                _in-xml-name="mitigating-factor"
-                _in-json-name="mitigating-factors"
-                gi="mitigating-factor">
+      <assembly name="mitigating-factor" gi="mitigating-factor">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='implementation-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -37808,18 +26990,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37839,17 +27014,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37869,18 +27037,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -37893,17 +27050,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37923,17 +27073,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37953,17 +27096,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/deadline" -->
-      <field _step="deadline"
-             _key="deadline"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/deadline"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/deadline"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="deadline"
              key="deadline"
-             _using-name="deadline"
-             _in-xml-name="deadline"
-             _in-json-name="deadline"
              gi="deadline"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -37983,18 +27119,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:response"
-                _step="response"
-                _key="remediations"
-                _key-ref="oscal-assessment-common:response"
-                _using-name="response"
-                _in-xml-name="response"
-                _in-json-name="remediations"
-                gi="response">
+      <assembly name="response" gi="response">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='lifecycle']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -38011,17 +27136,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38041,18 +27159,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38072,17 +27183,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38102,17 +27206,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38132,17 +27229,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38162,17 +27252,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38192,18 +27275,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38223,17 +27299,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38254,15 +27323,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -38273,17 +27335,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38303,17 +27358,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38333,15 +27381,8 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -38354,18 +27395,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38385,17 +27419,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38416,15 +27443,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -38435,17 +27455,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38465,17 +27478,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38495,15 +27501,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset" -->
-      <assembly _step="required-asset"
-                _key="required-assets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset"
-                _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets"
-                name="required-asset"
-                _using-name="required-asset"
-                _in-xml-name="required-asset"
-                _in-json-name="required-assets"
-                gi="required-asset">
+      <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='subjects']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -38517,18 +27515,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -38541,17 +27528,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38571,17 +27551,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38601,17 +27574,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38631,18 +27597,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38662,17 +27621,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38692,17 +27644,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38722,18 +27667,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38753,17 +27691,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38783,16 +27714,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing" -->
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -38805,17 +27727,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/on-date" -->
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -38827,15 +27739,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range" -->
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -38849,15 +27754,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency" -->
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -38870,15 +27768,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/dependency" -->
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -38887,15 +27777,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity" -->
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="*[@key='activity-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -38908,17 +27790,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38938,17 +27813,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38968,18 +27836,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -38999,17 +27860,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39030,15 +27884,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -39049,17 +27896,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39079,17 +27919,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39109,18 +27942,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39140,17 +27966,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39171,15 +27990,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -39190,17 +28002,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39220,17 +28025,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39250,17 +28048,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39280,16 +28071,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log" -->
-      <assembly _step="risk-log"
-                _key="risk-log"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log"
-                name="risk-log"
-                key="risk-log"
-                _using-name="risk-log"
-                _in-xml-name="risk-log"
-                _in-json-name="risk-log"
-                gi="risk-log">
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">risk-log</xsl:attribute>
          </xsl:if>
@@ -39300,15 +28082,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry" -->
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -39326,17 +28100,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39356,18 +28123,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39387,17 +28147,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/start" -->
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39417,17 +28170,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/end" -->
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39447,17 +28193,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39477,15 +28216,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response" -->
-      <assembly _step="related-response"
-                _key="related-responses"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses"
-                name="related-response"
-                _using-name="related-response"
-                _in-xml-name="related-response"
-                _in-json-name="related-responses"
-                gi="related-response">
+      <assembly name="related-response" gi="related-response">
          <xsl:apply-templates select="*[@key='response-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -39497,17 +28228,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39527,17 +28251,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39557,17 +28274,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39587,18 +28297,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39618,17 +28321,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39649,15 +28345,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -39668,17 +28357,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39698,17 +28380,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39728,15 +28403,8 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -39749,18 +28417,11 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39780,17 +28441,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39811,15 +28465,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -39830,17 +28477,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39860,17 +28500,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39890,16 +28523,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/related-observation" -->
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
@@ -39907,17 +28531,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-poam/poam-item/title"
-             _metaschema-json-id="/assembly/oscal-poam/poam-item/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39937,18 +28554,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-poam/poam-item/description"
-             _metaschema-json-id="/assembly/oscal-poam/poam-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39968,17 +28578,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -39998,15 +28601,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/origin" -->
-      <assembly _step="origin"
-                _key="origins"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/origin"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/origins"
-                name="origin"
-                _using-name="origin"
-                _in-xml-name="origin"
-                _in-json-name="origins"
-                gi="origin">
+      <assembly name="origin" gi="origin">
          <xsl:apply-templates select="*[@key='actors']"/>
       </assembly>
    </xsl:template>
@@ -40014,17 +28609,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -40044,16 +28632,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/related-observation" -->
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/related-observation"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
@@ -40061,16 +28640,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/associated-risk" -->
-      <assembly as-type="empty"
-                _step="associated-risk"
-                _key="related-risks"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/associated-risk"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/related-risks"
-                name="associated-risk"
-                _using-name="associated-risk"
-                _in-xml-name="associated-risk"
-                _in-json-name="related-risks"
-                gi="associated-risk">
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="*[@key='risk-uuid']"/>
       </assembly>
    </xsl:template>
@@ -40078,15 +28648,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -40102,17 +28664,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -40132,18 +28687,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -40163,19 +28711,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -40192,16 +28730,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -40214,17 +28743,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -40244,17 +28766,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -40274,15 +28789,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -40292,17 +28799,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -40356,11 +28856,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 6364d31e8d..d939f6baa3 100644
--- a/xml/convert/oscal_component_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_component_json-to-xml-converter.xsl
@@ -74,13 +74,8 @@
    <xsl:template match="j:map[@key='component-definition']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition"
-                _metaschema-json-id="/assembly/oscal-component-definition/component-definition"
-                name="component-definition"
+      <assembly name="component-definition"
                 key="component-definition"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">component-definition</xsl:attribute>
@@ -99,19 +94,7 @@
    <xsl:template match="j:map[@key='metadata']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="metadata" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -134,18 +117,7 @@
    <xsl:template match="j:array[@key='props']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="prop" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -157,18 +129,7 @@
    <xsl:template match="j:array[@key='links']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="link" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
@@ -178,18 +139,7 @@
    <xsl:template match="j:array[@key='roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -202,18 +152,7 @@
    <xsl:template match="j:array[@key='locations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='address']"/>
@@ -228,18 +167,7 @@
    <xsl:template match="j:array[@key='parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='name']"/>
@@ -258,18 +186,7 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -281,17 +198,7 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-component-definition" -->
       <assembly as-type="empty"
-                _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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:import-component-definition"
-                _step="import-component-definition"
-                _key="import-component-definitions"
-                _key-ref="oscal-component-definition:import-component-definition"
-                _using-name="import-component-definition"
-                _in-xml-name="import-component-definition"
-                _in-json-name="import-component-definitions"
                 gi="import-component-definition">
          <xsl:apply-templates select="*[@key='href']"/>
       </assembly>
@@ -299,18 +206,7 @@
    <xsl:template match="j:array[@key='components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:defined-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-component-definition:defined-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="defined-component" gi="component">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -327,18 +223,7 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -349,18 +234,7 @@
    <xsl:template match="j:array[@key='protocols']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="protocol" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -370,19 +244,7 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="port-range" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="*[@key='start']"/>
          <xsl:apply-templates select="*[@key='end']"/>
          <xsl:apply-templates select="*[@key='transport']"/>
@@ -391,18 +253,7 @@
    <xsl:template match="j:array[@key='set-parameters']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="set-parameter" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:set-parameter"
-                _step="set-parameter"
-                _key="set-parameters"
-                _key-ref="oscal-implementation-common:set-parameter"
-                _using-name="set-parameter"
-                _in-xml-name="set-parameter"
-                _in-json-name="set-parameters"
-                gi="set-parameter">
+      <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="*[@key='param-id']"/>
          <xsl:apply-templates select="*[@key='values']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
@@ -411,18 +262,7 @@
    <xsl:template match="j:array[@key='capabilities']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="capability" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:capability"
-                _step="capability"
-                _key="capabilities"
-                _key-ref="oscal-component-definition:capability"
-                _using-name="capability"
-                _in-xml-name="capability"
-                _in-json-name="capabilities"
-                gi="capability">
+      <assembly name="capability" gi="capability">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -436,18 +276,7 @@
    <xsl:template match="j:array[@key='incorporates-components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="incorporates-component" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:incorporates-component"
-                _step="incorporates-component"
-                _key="incorporates-components"
-                _key-ref="oscal-component-definition:incorporates-component"
-                _using-name="incorporates-component"
-                _in-xml-name="incorporates-component"
-                _in-json-name="incorporates-components"
-                gi="incorporates-component">
+      <assembly name="incorporates-component" gi="incorporates-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
       </assembly>
@@ -455,19 +284,7 @@
    <xsl:template match="j:map[@key='back-matter']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="back-matter" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -477,21 +294,11 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -510,19 +317,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -538,19 +335,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -566,20 +353,7 @@
    <xsl:template match="j:array[@key='hashes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="hash" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="*[@key='algorithm']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
@@ -593,15 +367,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:string[@key='uuid']"><!-- XML match="component-definition/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/component-definition/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -612,15 +379,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"><!-- XML match="prop/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -631,15 +391,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -648,18 +401,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"><!-- XML match="prop/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -669,15 +411,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"><!-- XML match="prop/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -688,15 +423,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"><!-- XML match="prop/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -707,15 +435,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"><!-- XML match="link/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -726,15 +447,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"><!-- XML match="link/@rel" -->
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -745,18 +459,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -768,15 +472,8 @@
                  priority="6"><!-- XML match="component-definition/metadata/document-id/@scheme | component-definition/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -785,18 +482,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"><!-- XML match="role/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -806,15 +492,8 @@
    <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"><!-- XML match="location/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -825,18 +504,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="component-definition/metadata/location/address/@type | component-definition/metadata/party/address/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -848,15 +517,8 @@
                  priority="8"><!-- XML match="component-definition/metadata/location/telephone-number/@type | component-definition/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -867,15 +529,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"><!-- XML match="party/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -886,15 +541,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"><!-- XML match="party/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -906,15 +554,8 @@
                  priority="8"><!-- XML match="component-definition/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -925,15 +566,8 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -944,15 +578,8 @@
    <xsl:template match="j:array[@key='import-component-definitions']/j:map/j:string[@key='href']"><!-- XML match="import-component-definition/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-component-definition/import-component-definition/href"
-            _metaschema-json-id="/assembly/oscal-component-definition/import-component-definition/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -963,15 +590,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/defined-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -982,18 +602,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/type"
-            _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/src/metaschema/oscal_component_metaschema.xml"
-            _key-name="oscal-component-definition:defined-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-component-definition:defined-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1004,15 +614,8 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1023,15 +626,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1042,15 +638,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1061,15 +650,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -1080,15 +662,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -1099,15 +674,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -1119,15 +687,8 @@
                  priority="7"><!-- XML match="component-definition/component/control-implementation/@uuid | component-definition/capability/control-implementation/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1138,18 +699,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source']"><!-- XML match="component-definition/component/control-implementation/@source | component-definition/capability/control-implementation/@source" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/source"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:source"
-            _step="source"
-            _key="source"
-            _key-ref="oscal-implementation-common:source"
-            _using-name="source"
-            _in-xml-name="source"
-            _in-json-name="source"
             gi="source">
          <xsl:value-of select="."/>
       </flag>
@@ -1160,18 +711,8 @@
    <xsl:template match="j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"><!-- XML match="set-parameter/@param-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/param-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:param-id"
-            _step="param-id"
-            _key="param-id"
-            _key-ref="oscal-implementation-common:param-id"
-            _using-name="param-id"
-            _in-xml-name="param-id"
-            _in-json-name="param-id"
             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1183,15 +724,8 @@
                  priority="9"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/@uuid | component-definition/capability/control-implementation/implemented-requirement/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1202,18 +736,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/@control-id | component-definition/capability/control-implementation/implemented-requirement/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1224,18 +748,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/@statement-id | component-definition/capability/control-implementation/implemented-requirement/statement/@statement-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-component-definition/statement/statement-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:statement-id"
-            _step="statement-id"
-            _key="statement-id"
-            _key-ref="oscal-implementation-common:statement-id"
-            _using-name="statement-id"
-            _in-xml-name="statement-id"
-            _in-json-name="statement-id"
             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1247,15 +761,8 @@
                  priority="11"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/@uuid | component-definition/capability/control-implementation/implemented-requirement/statement/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/statement/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/statement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1266,15 +773,8 @@
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='uuid']"><!-- XML match="capability/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/capability/uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/capability/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1285,15 +785,8 @@
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='name']"><!-- XML match="capability/@name" -->
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-component-definition/capability/name"
-            _metaschema-json-id="/assembly/oscal-component-definition/capability/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1304,15 +797,8 @@
    <xsl:template match="j:array[@key='incorporates-components']/j:map/j:string[@key='component-uuid']"><!-- XML match="incorporates-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-component-definition/incorporates-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-component-definition/incorporates-component/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1324,15 +810,8 @@
                  priority="6"><!-- XML match="component-definition/back-matter/resource/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1344,15 +823,8 @@
                  priority="8"><!-- XML match="component-definition/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1363,18 +835,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="component-definition/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1385,15 +847,8 @@
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -1405,15 +860,8 @@
                  priority="7"><!-- XML match="component-definition/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -1424,18 +872,8 @@
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="component-definition/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1447,17 +885,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1477,20 +908,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1510,20 +931,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1543,20 +954,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1576,20 +977,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1609,18 +1000,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -1639,10 +1019,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1653,17 +1030,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1683,20 +1053,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1716,20 +1076,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1749,20 +1099,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1782,20 +1122,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1815,17 +1145,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1845,19 +1168,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -1874,17 +1187,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1904,17 +1210,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1934,17 +1233,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1964,18 +1256,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1995,17 +1280,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2025,17 +1303,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2055,19 +1326,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -2083,19 +1342,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2112,17 +1361,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2142,17 +1384,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2172,17 +1407,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2202,17 +1430,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2232,19 +1453,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2261,19 +1472,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2290,16 +1491,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2316,17 +1510,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2346,17 +1533,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2376,17 +1556,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2406,16 +1579,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2432,17 +1598,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2462,19 +1621,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2491,19 +1640,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2520,18 +1659,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -2544,19 +1672,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2573,17 +1691,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2603,17 +1714,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2633,17 +1737,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2663,17 +1760,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2693,16 +1783,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2719,17 +1802,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2749,17 +1825,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/title"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2779,18 +1848,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2810,17 +1872,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/purpose"
-             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2840,17 +1895,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2870,17 +1918,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2900,17 +1941,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2930,18 +1964,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:control-implementation"
-                _step="control-implementation"
-                _key="control-implementations"
-                _key-ref="oscal-component-definition:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementations"
-                gi="control-implementation">
+      <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='source']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -2955,18 +1978,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2986,17 +2002,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3016,16 +2025,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3042,18 +2044,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-component-definition:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -3069,18 +2060,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3100,17 +2084,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3130,16 +2107,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3156,17 +2126,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3186,18 +2149,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-component-definition:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="*[@key='statement-id']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -3211,18 +2163,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/statement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/statement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3242,17 +2187,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3272,17 +2210,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3302,18 +2233,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/capability/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/capability/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3333,17 +2257,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3363,18 +2280,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/incorporates-component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/incorporates-component/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/incorporates-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3394,18 +2304,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:control-implementation"
-                _step="control-implementation"
-                _key="control-implementations"
-                _key-ref="oscal-component-definition:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementations"
-                gi="control-implementation">
+      <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='source']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -3419,18 +2318,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3450,17 +2342,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3480,16 +2365,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3506,18 +2384,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-component-definition:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -3533,18 +2400,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3564,17 +2424,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3594,16 +2447,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3620,17 +2466,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3650,18 +2489,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement" -->
-      <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/src/metaschema/oscal_component_metaschema.xml"
-                _key-name="oscal-component-definition:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-component-definition:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="*[@key='statement-id']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -3675,18 +2503,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-component-definition/statement/description"
-             _metaschema-json-id="/assembly/oscal-component-definition/statement/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3706,17 +2527,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3736,17 +2550,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3766,15 +2573,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -3790,17 +2589,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3820,18 +2612,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3851,19 +2636,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3880,16 +2655,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -3902,17 +2668,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3932,17 +2691,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3962,15 +2714,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -3980,17 +2724,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -4044,11 +2781,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 ecef1edbf3..4439e77c04 100644
--- a/xml/convert/oscal_poam_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_poam_json-to-xml-converter.xsl
@@ -74,13 +74,8 @@
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones"
-                _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones"
-                name="plan-of-action-and-milestones"
+      <assembly 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/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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">plan-of-action-and-milestones</xsl:attribute>
@@ -102,19 +97,7 @@
    <xsl:template match="j:map[@key='metadata']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="metadata" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -137,18 +120,7 @@
    <xsl:template match="j:array[@key='props']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="prop" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -160,18 +132,7 @@
    <xsl:template match="j:array[@key='links']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="link" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
@@ -181,18 +142,7 @@
    <xsl:template match="j:array[@key='roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -205,18 +155,7 @@
    <xsl:template match="j:array[@key='locations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='address']"/>
@@ -231,18 +170,7 @@
    <xsl:template match="j:array[@key='parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='name']"/>
@@ -261,18 +189,7 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -283,19 +200,7 @@
    <xsl:template match="j:map[@key='import-ssp']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-ssp" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/import-ssp"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:import-ssp"
-                _step="import-ssp"
-                _key="import-ssp"
-                _key-ref="oscal-assessment-common:import-ssp"
-                _using-name="import-ssp"
-                _in-xml-name="import-ssp"
-                _in-json-name="import-ssp"
-                gi="import-ssp">
+      <assembly name="import-ssp" key="import-ssp" gi="import-ssp">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-ssp</xsl:attribute>
          </xsl:if>
@@ -306,18 +211,8 @@
    <xsl:template match="j:map[@key='local-definitions']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="local-definitions" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
-                _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
-                name="local-definitions"
+      <assembly name="local-definitions"
                 key="local-definitions"
-                _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"
-                _key-ref="oscal-poam:local-definitions"
-                _using-name="local-definitions"
-                _in-xml-name="local-definitions"
-                _in-json-name="local-definitions"
                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
@@ -330,18 +225,7 @@
    <xsl:template match="j:array[@key='components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-implementation-common:system-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="system-component" gi="component">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -358,18 +242,7 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -380,18 +253,7 @@
    <xsl:template match="j:array[@key='protocols']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="protocol" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -401,19 +263,7 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="port-range" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="*[@key='start']"/>
          <xsl:apply-templates select="*[@key='end']"/>
          <xsl:apply-templates select="*[@key='transport']"/>
@@ -422,18 +272,7 @@
    <xsl:template match="j:array[@key='inventory-items']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="inventory-item" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:inventory-item"
-                _step="inventory-item"
-                _key="inventory-items"
-                _key-ref="oscal-implementation-common:inventory-item"
-                _using-name="inventory-item"
-                _in-xml-name="inventory-item"
-                _in-json-name="inventory-items"
-                gi="inventory-item">
+      <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -446,18 +285,7 @@
    <xsl:template match="j:array[@key='observations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="observation" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:observation"
-                _step="observation"
-                _key="observations"
-                _key-ref="oscal-assessment-common:observation"
-                _using-name="observation"
-                _in-xml-name="observation"
-                _in-json-name="observations"
-                gi="observation">
+      <assembly name="observation" gi="observation">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -476,18 +304,7 @@
    <xsl:template match="(j:array[@key='origins']/j:map | j:array[@key='origins']/j:map | j:map[@key='origin'] | j:array[@key='origins']/j:map | j:array[@key='origins']/j:map)">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="origin" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin"
-                _step="origin"
-                _key="origins"
-                _key-ref="oscal-assessment-common:origin"
-                _using-name="origin"
-                _in-xml-name="origin"
-                _in-json-name="origins"
-                gi="origin">
+      <assembly name="origin" gi="origin">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">origin</xsl:attribute>
          </xsl:if>
@@ -498,18 +315,7 @@
    <xsl:template match="j:array[@key='actors']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="actor" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:origin-actor"
-                _step="actor"
-                _key="actors"
-                _key-ref="oscal-assessment-common:origin-actor"
-                _using-name="actor"
-                _in-xml-name="actor"
-                _in-json-name="actors"
-                gi="actor">
+      <assembly name="origin-actor" gi="actor">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='actor-uuid']"/>
          <xsl:apply-templates select="*[@key='role-id']"/>
@@ -520,18 +326,7 @@
    <xsl:template match="j:array[@key='related-tasks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="related-task" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:related-task"
-                _step="related-task"
-                _key="related-tasks"
-                _key-ref="oscal-assessment-common:related-task"
-                _using-name="related-task"
-                _in-xml-name="related-task"
-                _in-json-name="related-tasks"
-                gi="related-task">
+      <assembly name="related-task" gi="related-task">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -544,18 +339,7 @@
    <xsl:template match="j:array[@key='subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:assessment-subject"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:assessment-subject"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -569,18 +353,7 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="include-subject"
-                _key="include-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="include-subject"
-                _in-xml-name="include-subject"
-                _in-json-name="include-subjects"
-                gi="include-subject">
+      <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -591,18 +364,7 @@
    <xsl:template match="j:array[@key='exclude-subjects']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="exclude-subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:select-subject-by-id"
-                _step="exclude-subject"
-                _key="exclude-subjects"
-                _key-ref="oscal-assessment-common:select-subject-by-id"
-                _using-name="exclude-subject"
-                _in-xml-name="exclude-subject"
-                _in-json-name="exclude-subjects"
-                gi="exclude-subject">
+      <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -613,18 +375,7 @@
    <xsl:template match="j:array[@key='risks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="risk" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:risk"
-                _step="risk"
-                _key="risks"
-                _key-ref="oscal-assessment-common:risk"
-                _using-name="risk"
-                _in-xml-name="risk"
-                _in-json-name="risks"
-                gi="risk">
+      <assembly name="risk" gi="risk">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -645,18 +396,7 @@
    <xsl:template match="j:array[@key='characterizations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="characterization" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:characterization"
-                _step="characterization"
-                _key="characterizations"
-                _key-ref="oscal-assessment-common:characterization"
-                _using-name="characterization"
-                _in-xml-name="characterization"
-                _in-json-name="characterizations"
-                gi="characterization">
+      <assembly name="characterization" gi="characterization">
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='origin']"/>
@@ -666,18 +406,7 @@
    <xsl:template match="j:array[@key='tasks']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="task" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:task"
-                _step="task"
-                _key="tasks"
-                _key-ref="oscal-assessment-common:task"
-                _using-name="task"
-                _in-xml-name="task"
-                _in-json-name="tasks"
-                gi="task">
+      <assembly name="task" gi="task">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -696,19 +425,7 @@
    <xsl:template match="j:array[@key='logged-by']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="logged-by" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:logged-by"
-                _step="logged-by"
-                _key="logged-by"
-                _key-ref="oscal-assessment-common:logged-by"
-                _using-name="logged-by"
-                _in-xml-name="logged-by"
-                _in-json-name="logged-by"
-                gi="logged-by">
+      <assembly as-type="empty" name="logged-by" gi="logged-by">
          <xsl:apply-templates select="*[@key='party-uuid']"/>
          <xsl:apply-templates select="*[@key='role-id']"/>
       </assembly>
@@ -716,18 +433,7 @@
    <xsl:template match="j:array[@key='poam-items']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="poam-item" -->
-      <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/src/metaschema/oscal_poam_metaschema.xml"
-                _key-name="oscal-poam:poam-item"
-                _step="poam-item"
-                _key="poam-items"
-                _key-ref="oscal-poam:poam-item"
-                _using-name="poam-item"
-                _in-xml-name="poam-item"
-                _in-json-name="poam-items"
-                gi="poam-item">
+      <assembly name="poam-item" gi="poam-item">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -742,19 +448,7 @@
    <xsl:template match="j:map[@key='back-matter']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="back-matter" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -764,21 +458,11 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -797,19 +481,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -825,19 +499,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -853,20 +517,10 @@
    <xsl:template match="j:map[@key='system-id']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/system-id"
-             _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/system-id"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-id"
              key="system-id"
-             _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"
-             _key-ref="oscal-implementation-common:system-id"
-             _using-name="system-id"
-             _in-xml-name="system-id"
-             _in-json-name="system-id"
              gi="system-id">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-id</xsl:attribute>
@@ -884,20 +538,7 @@
    <xsl:template match="j:array[@key='threat-ids']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="threat-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/threat-id"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/threat-ids"
-             collapsible="no"
-             as-type="uri"
-             name="threat-id"
-             _base-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"
-             _key-ref="oscal-assessment-common:threat-id"
-             _using-name="threat-id"
-             _in-xml-name="threat-id"
-             _in-json-name="threat-ids"
-             gi="threat-id">
+      <field collapsible="no" as-type="uri" name="threat-id" gi="threat-id">
          <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -912,20 +553,10 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/status-change"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-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"
-             _key-ref="oscal-assessment-common:risk-status"
-             _using-name="status-change"
-             _in-xml-name="status-change"
-             _in-json-name="status-change"
              gi="status-change"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -944,20 +575,7 @@
    <xsl:template match="j:array[@key='hashes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="hash" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="*[@key='algorithm']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
@@ -971,15 +589,8 @@
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:string[@key='uuid']"><!-- XML match="plan-of-action-and-milestones/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/uuid"
-            _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -990,15 +601,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"><!-- XML match="prop/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1009,15 +613,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1026,18 +623,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"><!-- XML match="prop/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1047,15 +633,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"><!-- XML match="prop/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -1066,15 +645,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"><!-- XML match="prop/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1085,15 +657,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"><!-- XML match="link/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1104,15 +669,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"><!-- XML match="link/@rel" -->
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -1123,18 +681,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1146,15 +694,8 @@
                  priority="6"><!-- XML match="plan-of-action-and-milestones/metadata/document-id/@scheme | plan-of-action-and-milestones/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1163,18 +704,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"><!-- XML match="role/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1184,15 +714,8 @@
    <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"><!-- XML match="location/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1203,18 +726,8 @@
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="plan-of-action-and-milestones/metadata/location/address/@type | plan-of-action-and-milestones/metadata/party/address/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1226,15 +739,8 @@
                  priority="8"><!-- XML match="plan-of-action-and-milestones/metadata/location/telephone-number/@type | plan-of-action-and-milestones/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1245,15 +751,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"><!-- XML match="party/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1264,15 +763,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"><!-- XML match="party/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1284,15 +776,8 @@
                  priority="8"><!-- XML match="plan-of-action-and-milestones/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1303,15 +788,8 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1322,15 +800,8 @@
    <xsl:template match="j:map[@key='import-ssp']/j:string[@key='href']"><!-- XML match="import-ssp/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/import-ssp/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/import-ssp/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1341,15 +812,8 @@
    <xsl:template match="j:map[@key='system-id']/j:string[@key='identifier-type']"><!-- XML match="system-id/@identifier-type" -->
       <flag in-json="string"
             as-type="uri"
-            _step="identifier-type"
-            _key="identifier-type"
-            _metaschema-xml-id="/field/oscal-implementation-common/system-id/identifier-type"
-            _metaschema-json-id="/field/oscal-implementation-common/system-id/identifier-type"
             name="identifier-type"
             key="identifier-type"
-            _using-name="identifier-type"
-            _in-xml-name="identifier-type"
-            _in-json-name="identifier-type"
             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1360,15 +824,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1379,18 +836,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/type"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:system-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-implementation-common:system-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1402,15 +849,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/local-definitions/component/status/@state" -->
       <flag in-json="string"
             as-type="token"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -1421,15 +861,8 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1440,15 +873,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1459,15 +885,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1478,15 +897,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -1497,15 +909,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -1516,15 +921,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -1535,15 +933,8 @@
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"><!-- XML match="inventory-item/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1555,15 +946,8 @@
                  priority="8"><!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1574,15 +958,8 @@
    <xsl:template match="j:array[@key='observations']/j:map/j:string[@key='uuid']"><!-- XML match="observation/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1593,15 +970,8 @@
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='type']"><!-- XML match="actor/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1612,15 +982,8 @@
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='actor-uuid']"><!-- XML match="actor/@actor-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="actor-uuid"
-            _key="actor-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/actor-uuid"
             name="actor-uuid"
             key="actor-uuid"
-            _using-name="actor-uuid"
-            _in-xml-name="actor-uuid"
-            _in-json-name="actor-uuid"
             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1631,15 +994,8 @@
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='role-id']"><!-- XML match="actor/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/origin-actor/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/origin-actor/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1650,15 +1006,8 @@
    <xsl:template match="j:array[@key='related-tasks']/j:map/j:string[@key='task-uuid']"><!-- XML match="related-task/@task-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1669,15 +1018,8 @@
    <xsl:template match="j:array[@key='subjects']/j:map/j:string[@key='type']"><!-- XML match="subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1688,18 +1030,8 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="include-subject/@subject-uuid | exclude-subject/@subject-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1710,18 +1042,8 @@
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"><!-- XML match="include-subject/@type | exclude-subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1733,15 +1055,8 @@
                  priority="10"><!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="subject-placeholder-uuid"
-            _key="subject-placeholder-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject/subject-placeholder-uuid"
             name="subject-placeholder-uuid"
             key="subject-placeholder-uuid"
-            _using-name="subject-placeholder-uuid"
-            _in-xml-name="subject-placeholder-uuid"
-            _in-json-name="subject-placeholder-uuid"
             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1752,18 +1067,8 @@
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="plan-of-action-and-milestones/observation/subject/@subject-uuid | plan-of-action-and-milestones/risk/mitigating-factor/subject/@subject-uuid | plan-of-action-and-milestones/risk/response/required-asset/subject/@subject-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-uuid"
-            _step="subject-uuid"
-            _key="subject-uuid"
-            _key-ref="oscal-assessment-common:subject-uuid"
-            _using-name="subject-uuid"
-            _in-xml-name="subject-uuid"
-            _in-json-name="subject-uuid"
             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1774,18 +1079,8 @@
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type']"><!-- XML match="plan-of-action-and-milestones/observation/subject/@type | plan-of-action-and-milestones/risk/mitigating-factor/subject/@type | plan-of-action-and-milestones/risk/response/required-asset/subject/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/type"
-            _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/src/metaschema/oscal_assessment-common_metaschema.xml"
-            _key-name="oscal-assessment-common:subject-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-assessment-common:subject-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1797,15 +1092,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
-            _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1816,15 +1104,8 @@
    <xsl:template match="j:array[@key='risks']/j:map/j:string[@key='uuid']"><!-- XML match="risk/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1835,15 +1116,8 @@
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='system']"><!-- XML match="threat-id/@system" -->
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/system"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -1854,15 +1128,8 @@
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='href']"><!-- XML match="threat-id/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/field/oscal-assessment-common/threat-id/href"
-            _metaschema-json-id="/field/oscal-assessment-common/threat-id/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1874,15 +1141,8 @@
                  priority="9"><!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/name"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1894,15 +1154,8 @@
                  priority="9"><!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/@system" -->
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/system"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -1914,15 +1167,8 @@
                  priority="9"><!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet/value"
-            _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -1934,15 +1180,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1954,15 +1193,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/@implementation-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="implementation-uuid"
-            _key="implementation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/implementation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/implementation-uuid"
             name="implementation-uuid"
             key="implementation-uuid"
-            _using-name="implementation-uuid"
-            _in-xml-name="implementation-uuid"
-            _in-json-name="implementation-uuid"
             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1974,15 +1206,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/risk/response/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1994,15 +1219,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/risk/response/@lifecycle" -->
       <flag in-json="string"
             as-type="token"
-            _step="lifecycle"
-            _key="lifecycle"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/lifecycle"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/lifecycle"
             name="lifecycle"
             key="lifecycle"
-            _using-name="lifecycle"
-            _in-xml-name="lifecycle"
-            _in-json-name="lifecycle"
             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
@@ -2014,15 +1232,8 @@
                  priority="9"><!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2033,15 +1244,8 @@
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid']"><!-- XML match="task/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2052,15 +1256,8 @@
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type']"><!-- XML match="task/@type" -->
       <flag in-json="string"
             as-type="token"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/type"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -2072,15 +1269,8 @@
                  priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/on-date/@date" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="date"
-            _key="date"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date/date"
             name="date"
             key="date"
-            _using-name="date"
-            _in-xml-name="date"
-            _in-json-name="date"
             gi="date">
          <xsl:value-of select="."/>
       </flag>
@@ -2092,15 +1282,8 @@
                  priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@start" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -2112,15 +1295,8 @@
                  priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@end" -->
       <flag in-json="string"
             as-type="dateTime-with-timezone"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -2132,15 +1308,8 @@
                  priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@period" -->
       <flag in-json="number"
             as-type="positiveInteger"
-            _step="period"
-            _key="period"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/period"
             name="period"
             key="period"
-            _using-name="period"
-            _in-xml-name="period"
-            _in-json-name="period"
             gi="period">
          <xsl:value-of select="."/>
       </flag>
@@ -2152,15 +1321,8 @@
                  priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@unit" -->
       <flag in-json="string"
             as-type="string"
-            _step="unit"
-            _key="unit"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency/unit"
             name="unit"
             key="unit"
-            _using-name="unit"
-            _in-xml-name="unit"
-            _in-json-name="unit"
             gi="unit">
          <xsl:value-of select="."/>
       </flag>
@@ -2172,15 +1334,8 @@
                  priority="11"><!-- XML match="plan-of-action-and-milestones/risk/response//task/dependency/@task-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="task-uuid"
-            _key="task-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency/task-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies/task-uuid"
             name="task-uuid"
             key="task-uuid"
-            _using-name="task-uuid"
-            _in-xml-name="task-uuid"
-            _in-json-name="task-uuid"
             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2192,15 +1347,8 @@
                  priority="11"><!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/@activity-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="activity-uuid"
-            _key="activity-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/activity-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/activity-uuid"
             name="activity-uuid"
             key="activity-uuid"
-            _using-name="activity-uuid"
-            _in-xml-name="activity-uuid"
-            _in-json-name="activity-uuid"
             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2212,15 +1360,8 @@
                  priority="8"><!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2231,15 +1372,8 @@
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='party-uuid']"><!-- XML match="logged-by/@party-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="party-uuid"
-            _key="party-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/party-uuid"
             name="party-uuid"
             key="party-uuid"
-            _using-name="party-uuid"
-            _in-xml-name="party-uuid"
-            _in-json-name="party-uuid"
             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2250,15 +1384,8 @@
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='role-id']"><!-- XML match="logged-by/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/logged-by/role-id"
-            _metaschema-json-id="/assembly/oscal-assessment-common/logged-by/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -2270,15 +1397,8 @@
                  priority="10"><!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/@response-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="response-uuid"
-            _key="response-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response/response-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses/response-uuid"
             name="response-uuid"
             key="response-uuid"
-            _using-name="response-uuid"
-            _in-xml-name="response-uuid"
-            _in-json-name="response-uuid"
             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2290,15 +1410,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/risk/related-observation/@observation-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2309,15 +1422,8 @@
    <xsl:template match="j:array[@key='poam-items']/j:map/j:string[@key='uuid']"><!-- XML match="poam-item/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2329,15 +1435,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/related-observation/@observation-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="observation-uuid"
-            _key="observation-uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/related-observation/observation-uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/related-observations/observation-uuid"
             name="observation-uuid"
             key="observation-uuid"
-            _using-name="observation-uuid"
-            _in-xml-name="observation-uuid"
-            _in-json-name="observation-uuid"
             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2349,15 +1448,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/associated-risk/@risk-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="risk-uuid"
-            _key="risk-uuid"
-            _metaschema-xml-id="/assembly/oscal-poam/poam-item/associated-risk/risk-uuid"
-            _metaschema-json-id="/assembly/oscal-poam/poam-item/related-risks/risk-uuid"
             name="risk-uuid"
             key="risk-uuid"
-            _using-name="risk-uuid"
-            _in-xml-name="risk-uuid"
-            _in-json-name="risk-uuid"
             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2369,15 +1461,8 @@
                  priority="6"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2389,15 +1474,8 @@
                  priority="8"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2408,18 +1486,8 @@
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2430,15 +1498,8 @@
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -2450,15 +1511,8 @@
                  priority="7"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -2469,18 +1523,8 @@
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2492,17 +1536,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2522,20 +1559,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2555,20 +1582,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2588,20 +1605,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2621,20 +1628,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2654,18 +1651,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -2684,10 +1670,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -2698,17 +1681,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2728,20 +1704,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2761,20 +1727,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2794,20 +1750,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2827,20 +1773,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2860,17 +1796,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2890,19 +1819,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2919,17 +1838,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2949,17 +1861,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2979,17 +1884,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3009,18 +1907,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3040,17 +1931,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3070,17 +1954,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3100,19 +1977,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -3128,19 +1993,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3157,17 +2012,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3187,17 +2035,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3217,17 +2058,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3247,17 +2081,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3277,19 +2104,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3306,19 +2123,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3335,16 +2142,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3361,17 +2161,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3391,17 +2184,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3421,17 +2207,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3451,16 +2230,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3477,17 +2249,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3507,19 +2272,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3536,19 +2291,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3565,18 +2310,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -3589,19 +2323,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3618,17 +2342,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3648,17 +2365,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3678,17 +2388,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3708,17 +2411,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3738,16 +2434,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3764,17 +2453,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3794,17 +2476,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3824,18 +2499,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3855,17 +2523,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3885,17 +2546,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3915,16 +2569,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -3936,17 +2581,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3966,17 +2604,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3996,18 +2627,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4027,17 +2651,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4057,17 +2674,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4087,15 +2697,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component" -->
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -4107,17 +2709,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4137,17 +2732,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4167,17 +2755,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4197,18 +2778,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4228,17 +2802,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4258,16 +2825,9 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/method" -->
-      <field _step="method"
-             _key="methods"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/method"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/methods"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="method"
-             _using-name="method"
-             _in-xml-name="method"
-             _in-json-name="methods"
              gi="method"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4284,16 +2844,9 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/type" -->
-      <field _step="type"
-             _key="types"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/type"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/types"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="type"
-             _using-name="type"
-             _in-xml-name="type"
-             _in-json-name="types"
              gi="type"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4310,17 +2863,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4340,17 +2886,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4370,17 +2909,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4400,18 +2932,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4431,17 +2956,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4462,15 +2980,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -4481,17 +2992,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4511,17 +3015,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4541,15 +3038,8 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -4562,18 +3052,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4593,17 +3076,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4624,15 +3100,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -4643,17 +3112,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4673,17 +3135,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4703,18 +3158,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -4727,17 +3171,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4757,17 +3194,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4787,15 +3217,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence" -->
-      <assembly _step="relevant-evidence"
-                _key="relevant-evidence"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence"
-                name="relevant-evidence"
-                _using-name="relevant-evidence"
-                _in-xml-name="relevant-evidence"
-                _in-json-name="relevant-evidence"
-                gi="relevant-evidence">
+      <assembly name="relevant-evidence" gi="relevant-evidence">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -4807,18 +3229,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/relevant-evidence/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4838,17 +3253,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4868,17 +3276,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/collected" -->
-      <field _step="collected"
-             _key="collected"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/collected"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/collected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="collected"
              key="collected"
-             _using-name="collected"
-             _in-xml-name="collected"
-             _in-json-name="collected"
              gi="collected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4898,17 +3299,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/expires" -->
-      <field _step="expires"
-             _key="expires"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/observation/expires"
-             _metaschema-json-id="/assembly/oscal-assessment-common/observation/expires"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="expires"
              key="expires"
-             _using-name="expires"
-             _in-xml-name="expires"
-             _in-json-name="expires"
              gi="expires"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4928,17 +3322,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4958,18 +3345,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4989,18 +3369,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/statement" -->
-      <field _step="statement"
-             _key="statement"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/statement"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/statement"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="statement"
              key="statement"
-             _using-name="statement"
-             _in-xml-name="statement"
-             _in-json-name="statement"
              gi="statement"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5020,17 +3393,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5050,17 +3416,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/status" -->
-      <field _step="status"
-             _key="status"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/status"
-             collapsible="no"
+      <field 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">
          <xsl:if test="$with-key">
@@ -5080,17 +3439,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5110,17 +3462,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5140,17 +3485,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5170,18 +3508,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5201,17 +3532,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5232,15 +3556,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5251,17 +3568,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5281,17 +3591,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5311,15 +3614,8 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -5332,18 +3628,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5363,17 +3652,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5394,15 +3676,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5413,17 +3688,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5443,17 +3711,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5473,17 +3734,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5503,17 +3757,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5533,17 +3780,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5563,17 +3803,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5593,18 +3826,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5624,17 +3850,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5655,15 +3874,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5674,17 +3886,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5704,17 +3909,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5734,15 +3932,8 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -5755,18 +3946,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5786,17 +3970,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5817,15 +3994,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -5836,17 +4006,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5866,17 +4029,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5896,15 +4052,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/facet" -->
-      <assembly _step="facet"
-                _key="facets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/characterization/facet"
-                _metaschema-json-id="/assembly/oscal-assessment-common/characterization/facets"
-                name="facet"
-                _using-name="facet"
-                _in-xml-name="facet"
-                _in-json-name="facets"
-                gi="facet">
+      <assembly name="facet" gi="facet">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='value']"/>
@@ -5917,17 +4065,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5947,15 +4088,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor" -->
-      <assembly _step="mitigating-factor"
-                _key="mitigating-factors"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors"
-                name="mitigating-factor"
-                _using-name="mitigating-factor"
-                _in-xml-name="mitigating-factor"
-                _in-json-name="mitigating-factors"
-                gi="mitigating-factor">
+      <assembly name="mitigating-factor" gi="mitigating-factor">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='implementation-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -5968,18 +4101,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5999,17 +4125,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6029,18 +4148,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -6053,17 +4161,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6083,17 +4184,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6113,17 +4207,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/deadline" -->
-      <field _step="deadline"
-             _key="deadline"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/deadline"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/deadline"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="deadline"
              key="deadline"
-             _using-name="deadline"
-             _in-xml-name="deadline"
-             _in-json-name="deadline"
              gi="deadline"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6143,18 +4230,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:response"
-                _step="response"
-                _key="remediations"
-                _key-ref="oscal-assessment-common:response"
-                _using-name="response"
-                _in-xml-name="response"
-                _in-json-name="remediations"
-                gi="response">
+      <assembly name="response" gi="response">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='lifecycle']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -6171,17 +4247,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6201,18 +4270,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6232,17 +4294,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6262,17 +4317,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6292,17 +4340,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6322,17 +4363,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6352,18 +4386,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6383,17 +4410,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6414,15 +4434,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -6433,17 +4446,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6463,17 +4469,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6493,15 +4492,8 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -6514,18 +4506,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6545,17 +4530,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6576,15 +4554,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -6595,17 +4566,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6625,17 +4589,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6655,15 +4612,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset" -->
-      <assembly _step="required-asset"
-                _key="required-assets"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset"
-                _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets"
-                name="required-asset"
-                _using-name="required-asset"
-                _in-xml-name="required-asset"
-                _in-json-name="required-assets"
-                gi="required-asset">
+      <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='subjects']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -6677,18 +4626,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject" -->
-      <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/src/metaschema/oscal_assessment-common_metaschema.xml"
-                _key-name="oscal-assessment-common:subject-reference"
-                _step="subject"
-                _key="subjects"
-                _key-ref="oscal-assessment-common:subject-reference"
-                _using-name="subject"
-                _in-xml-name="subject"
-                _in-json-name="subjects"
-                gi="subject">
+      <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -6701,17 +4639,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/subject-reference/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6731,17 +4662,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6761,17 +4685,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6791,18 +4708,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6822,17 +4732,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6852,17 +4755,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6882,18 +4778,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/task/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/task/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6913,17 +4802,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6943,16 +4825,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing" -->
-      <assembly _step="timing"
-                _key="timing"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing"
-                name="timing"
-                key="timing"
-                _using-name="timing"
-                _in-xml-name="timing"
-                _in-json-name="timing"
-                gi="timing">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
@@ -6965,17 +4838,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/on-date" -->
-      <assembly as-type="empty"
-                _step="on-date"
-                _key="on-date"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/on-date"
-                name="on-date"
-                key="on-date"
-                _using-name="on-date"
-                _in-xml-name="on-date"
-                _in-json-name="on-date"
-                gi="on-date">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
@@ -6987,15 +4850,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range" -->
       <assembly as-type="empty"
-                _step="within-date-range"
-                _key="within-date-range"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/within-date-range"
                 name="within-date-range"
                 key="within-date-range"
-                _using-name="within-date-range"
-                _in-xml-name="within-date-range"
-                _in-json-name="within-date-range"
                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
@@ -7009,15 +4865,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency" -->
       <assembly as-type="empty"
-                _step="at-frequency"
-                _key="at-frequency"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/timing/at-frequency"
                 name="at-frequency"
                 key="at-frequency"
-                _using-name="at-frequency"
-                _in-xml-name="at-frequency"
-                _in-json-name="at-frequency"
                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
@@ -7030,15 +4879,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/dependency" -->
-      <assembly _step="dependency"
-                _key="dependencies"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/dependency"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/dependencies"
-                name="dependency"
-                _using-name="dependency"
-                _in-xml-name="dependency"
-                _in-json-name="dependencies"
-                gi="dependency">
+      <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -7047,15 +4888,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity" -->
-      <assembly _step="associated-activity"
-                _key="associated-activities"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity"
-                _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities"
-                name="associated-activity"
-                _using-name="associated-activity"
-                _in-xml-name="associated-activity"
-                _in-json-name="associated-activities"
-                gi="associated-activity">
+      <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="*[@key='activity-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -7068,17 +4901,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7098,17 +4924,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7128,18 +4947,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7159,17 +4971,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7190,15 +4995,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7209,17 +5007,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7239,17 +5030,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7269,18 +5053,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7300,17 +5077,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7331,15 +5101,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7350,17 +5113,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7380,17 +5136,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7410,17 +5159,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7440,16 +5182,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log" -->
-      <assembly _step="risk-log"
-                _key="risk-log"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log"
-                name="risk-log"
-                key="risk-log"
-                _using-name="risk-log"
-                _in-xml-name="risk-log"
-                _in-json-name="risk-log"
-                gi="risk-log">
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">risk-log</xsl:attribute>
          </xsl:if>
@@ -7460,15 +5193,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry" -->
-      <assembly _step="entry"
-                _key="entries"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries"
-                name="entry"
-                _using-name="entry"
-                _in-xml-name="entry"
-                _in-json-name="entries"
-                gi="entry">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -7486,17 +5211,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/title"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7516,18 +5234,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7547,17 +5258,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/start" -->
-      <field _step="start"
-             _key="start"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/start"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/start"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="start"
              key="start"
-             _using-name="start"
-             _in-xml-name="start"
-             _in-json-name="start"
              gi="start"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7577,17 +5281,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/end" -->
-      <field _step="end"
-             _key="end"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/end"
-             _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/end"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="end"
              key="end"
-             _using-name="end"
-             _in-xml-name="end"
-             _in-json-name="end"
              gi="end"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7607,17 +5304,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7637,15 +5327,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response" -->
-      <assembly _step="related-response"
-                _key="related-responses"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/related-response"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/related-responses"
-                name="related-response"
-                _using-name="related-response"
-                _in-xml-name="related-response"
-                _in-json-name="related-responses"
-                gi="related-response">
+      <assembly name="related-response" gi="related-response">
          <xsl:apply-templates select="*[@key='response-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -7657,17 +5339,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7687,17 +5362,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7717,17 +5385,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7747,18 +5408,11 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7778,17 +5432,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7809,15 +5456,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7828,17 +5468,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7858,17 +5491,10 @@
                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7888,15 +5514,8 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject" -->
-      <assembly _step="identified-subject"
-                _key="identified-subject"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                _metaschema-json-id="/assembly/oscal-assessment-common/related-task/identified-subject"
-                name="identified-subject"
+      <assembly name="identified-subject"
                 key="identified-subject"
-                _using-name="identified-subject"
-                _in-xml-name="identified-subject"
-                _in-json-name="identified-subject"
                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
@@ -7909,18 +5528,11 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7940,17 +5552,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7971,15 +5576,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-all" -->
       <assembly as-type="empty"
-                _step="include-all"
-                _key="include-all"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-all"
                 name="include-all"
                 key="include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -7990,17 +5588,10 @@
                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8020,17 +5611,10 @@
                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8050,16 +5634,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/related-observation" -->
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/risk/related-observation"
-                _metaschema-json-id="/assembly/oscal-assessment-common/risk/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
@@ -8067,17 +5642,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-poam/poam-item/title"
-             _metaschema-json-id="/assembly/oscal-poam/poam-item/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8097,18 +5665,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-poam/poam-item/description"
-             _metaschema-json-id="/assembly/oscal-poam/poam-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8128,17 +5689,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8158,15 +5712,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/origin" -->
-      <assembly _step="origin"
-                _key="origins"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/origin"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/origins"
-                name="origin"
-                _using-name="origin"
-                _in-xml-name="origin"
-                _in-json-name="origins"
-                gi="origin">
+      <assembly name="origin" gi="origin">
          <xsl:apply-templates select="*[@key='actors']"/>
       </assembly>
    </xsl:template>
@@ -8174,17 +5720,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/origin/actor/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8204,16 +5743,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/related-observation" -->
-      <assembly as-type="empty"
-                _step="related-observation"
-                _key="related-observations"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/related-observation"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/related-observations"
-                name="related-observation"
-                _using-name="related-observation"
-                _in-xml-name="related-observation"
-                _in-json-name="related-observations"
-                gi="related-observation">
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
@@ -8221,16 +5751,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/associated-risk" -->
-      <assembly as-type="empty"
-                _step="associated-risk"
-                _key="related-risks"
-                _metaschema-xml-id="/assembly/oscal-poam/poam-item/associated-risk"
-                _metaschema-json-id="/assembly/oscal-poam/poam-item/related-risks"
-                name="associated-risk"
-                _using-name="associated-risk"
-                _in-xml-name="associated-risk"
-                _in-json-name="related-risks"
-                gi="associated-risk">
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="*[@key='risk-uuid']"/>
       </assembly>
    </xsl:template>
@@ -8238,15 +5759,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -8262,17 +5775,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8292,18 +5798,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8323,19 +5822,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -8352,16 +5841,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -8374,17 +5854,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8404,17 +5877,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -8434,15 +5900,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -8452,17 +5910,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -8516,11 +5967,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 4f1854e2b1..c95942eab1 100644
--- a/xml/convert/oscal_profile_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_profile_json-to-xml-converter.xsl
@@ -74,14 +74,7 @@
    <xsl:template match="j:map[@key='profile']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile"
-                _metaschema-json-id="/assembly/oscal-profile/profile"
-                name="profile"
-                key="profile"
-                _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">
+      <assembly name="profile" key="profile" gi="profile">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">profile</xsl:attribute>
          </xsl:if>
@@ -99,19 +92,7 @@
    <xsl:template match="j:map[@key='metadata']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="metadata" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -134,18 +115,7 @@
    <xsl:template match="j:array[@key='props']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="prop" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -157,18 +127,7 @@
    <xsl:template match="j:array[@key='links']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="link" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
@@ -178,18 +137,7 @@
    <xsl:template match="j:array[@key='roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -202,18 +150,7 @@
    <xsl:template match="j:array[@key='locations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='address']"/>
@@ -228,18 +165,7 @@
    <xsl:template match="j:array[@key='parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='name']"/>
@@ -258,18 +184,7 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -280,18 +195,7 @@
    <xsl:template match="j:array[@key='imports']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:import"
-                _step="import"
-                _key="imports"
-                _key-ref="oscal-profile:import"
-                _using-name="import"
-                _in-xml-name="import"
-                _in-json-name="imports"
-                gi="import">
+      <assembly name="import" gi="import">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='include-all']"/>
          <xsl:apply-templates select="*[@key='include-controls']"/>
@@ -302,18 +206,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-all" -->
       <assembly as-type="empty"
-                _metaschema-xml-id="/assembly/oscal-profile/import/include-all"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:include-all"
-                _step="include-all"
-                _key="include-all"
-                _key-ref="oscal-profile:include-all"
-                _using-name="include-all"
-                _in-xml-name="include-all"
-                _in-json-name="include-all"
                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
@@ -323,19 +217,7 @@
    <xsl:template match="j:map[@key='merge']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="merge" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/merge"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:merge"
-                _step="merge"
-                _key="merge"
-                _key-ref="oscal-profile:merge"
-                _using-name="merge"
-                _in-xml-name="merge"
-                _in-json-name="merge"
-                gi="merge">
+      <assembly name="merge" key="merge" gi="merge">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">merge</xsl:attribute>
          </xsl:if>
@@ -347,20 +229,7 @@
    <xsl:template match="j:map[@key='combine']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="combine" -->
-      <assembly as-type="empty"
-                _metaschema-xml-id="/assembly/oscal-profile/merge/combine"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:combine"
-                _step="combine"
-                _key="combine"
-                _key-ref="oscal-profile:combine"
-                _using-name="combine"
-                _in-xml-name="combine"
-                _in-json-name="combine"
-                gi="combine">
+      <assembly as-type="empty" name="combine" key="combine" gi="combine">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">combine</xsl:attribute>
          </xsl:if>
@@ -370,19 +239,7 @@
    <xsl:template match="j:map[@key='custom']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="custom" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/merge/custom"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:custom"
-                _step="custom"
-                _key="custom"
-                _key-ref="oscal-profile:custom"
-                _using-name="custom"
-                _in-xml-name="custom"
-                _in-json-name="custom"
-                gi="custom">
+      <assembly name="custom" key="custom" gi="custom">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">custom</xsl:attribute>
          </xsl:if>
@@ -393,18 +250,7 @@
    <xsl:template match="j:array[@key='groups']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="group" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:group"
-                _step="group"
-                _key="groups"
-                _key-ref="oscal-profile:group"
-                _using-name="group"
-                _in-xml-name="group"
-                _in-json-name="groups"
-                gi="group">
+      <assembly name="group" gi="group">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -419,18 +265,7 @@
    <xsl:template match="j:array[@key='params']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="param" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter"
-                _step="param"
-                _key="params"
-                _key-ref="oscal-catalog-common:parameter"
-                _using-name="param"
-                _in-xml-name="param"
-                _in-json-name="params"
-                gi="param">
+      <assembly name="parameter" gi="param">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='depends-on']"/>
@@ -448,18 +283,7 @@
    <xsl:template match="j:array[@key='constraints']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="constraint" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-constraint"
-                _step="constraint"
-                _key="constraints"
-                _key-ref="oscal-catalog-common:parameter-constraint"
-                _using-name="constraint"
-                _in-xml-name="constraint"
-                _in-json-name="constraints"
-                gi="constraint">
+      <assembly name="parameter-constraint" gi="constraint">
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='tests']"/>
       </assembly>
@@ -467,37 +291,14 @@
    <xsl:template match="j:array[@key='guidelines']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="guideline" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-guideline"
-                _step="guideline"
-                _key="guidelines"
-                _key-ref="oscal-catalog-common:parameter-guideline"
-                _using-name="guideline"
-                _in-xml-name="guideline"
-                _in-json-name="guidelines"
-                gi="guideline">
+      <assembly name="parameter-guideline" gi="guideline">
          <xsl:apply-templates select="*[@key='prose']"/>
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='select']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="select" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/select"
-                _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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:parameter-selection"
-                _step="select"
-                _key="select"
-                _key-ref="oscal-catalog-common:parameter-selection"
-                _using-name="select"
-                _in-xml-name="select"
-                _in-json-name="select"
-                gi="select">
+      <assembly name="parameter-selection" key="select" gi="select">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">select</xsl:attribute>
          </xsl:if>
@@ -508,18 +309,7 @@
    <xsl:template match="j:array[@key='parts']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="part" -->
-      <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/src/metaschema/oscal_control-common_metaschema.xml"
-                _key-name="oscal-catalog-common:part"
-                _step="part"
-                _key="parts"
-                _key-ref="oscal-catalog-common:part"
-                _using-name="part"
-                _in-xml-name="part"
-                _in-json-name="parts"
-                gi="part">
+      <assembly name="part" gi="part">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -534,18 +324,7 @@
    <xsl:template match="j:array[@key='insert-controls']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="insert-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:insert-controls"
-                _step="insert-controls"
-                _key="insert-controls"
-                _key-ref="oscal-profile:insert-controls"
-                _using-name="insert-controls"
-                _in-xml-name="insert-controls"
-                _in-json-name="insert-controls"
-                gi="insert-controls">
+      <assembly name="insert-controls" gi="insert-controls">
          <xsl:apply-templates select="*[@key='order']"/>
          <xsl:apply-templates select="*[@key='include-all']"/>
          <xsl:apply-templates select="*[@key='include-controls']"/>
@@ -555,19 +334,7 @@
    <xsl:template match="j:map[@key='modify']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="modify" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/modify"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:modify"
-                _step="modify"
-                _key="modify"
-                _key-ref="oscal-profile:modify"
-                _using-name="modify"
-                _in-xml-name="modify"
-                _in-json-name="modify"
-                gi="modify">
+      <assembly name="modify" key="modify" gi="modify">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">modify</xsl:attribute>
          </xsl:if>
@@ -578,18 +345,7 @@
    <xsl:template match="j:array[@key='alters']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="alter" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:alter"
-                _step="alter"
-                _key="alters"
-                _key-ref="oscal-profile:alter"
-                _using-name="alter"
-                _in-xml-name="alter"
-                _in-json-name="alters"
-                gi="alter">
+      <assembly name="alter" gi="alter">
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='removes']"/>
          <xsl:apply-templates select="*[@key='adds']"/>
@@ -598,19 +354,7 @@
    <xsl:template match="j:array[@key='removes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remove" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:remove"
-                _step="remove"
-                _key="removes"
-                _key-ref="oscal-profile:remove"
-                _using-name="remove"
-                _in-xml-name="remove"
-                _in-json-name="removes"
-                gi="remove">
+      <assembly as-type="empty" name="remove" gi="remove">
          <xsl:apply-templates select="*[@key='by-name']"/>
          <xsl:apply-templates select="*[@key='by-class']"/>
          <xsl:apply-templates select="*[@key='by-id']"/>
@@ -621,18 +365,7 @@
    <xsl:template match="j:array[@key='adds']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="add" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:add"
-                _step="add"
-                _key="adds"
-                _key-ref="oscal-profile:add"
-                _using-name="add"
-                _in-xml-name="add"
-                _in-json-name="adds"
-                gi="add">
+      <assembly name="add" gi="add">
          <xsl:apply-templates select="*[@key='position']"/>
          <xsl:apply-templates select="*[@key='by-id']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -645,19 +378,7 @@
    <xsl:template match="j:map[@key='back-matter']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="back-matter" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -667,21 +388,11 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -700,19 +411,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -728,19 +429,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -756,20 +447,10 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-profile/merge/as-is"
-             collapsible="no"
+      <field collapsible="no"
              as-type="boolean"
              name="as-is"
              key="as-is"
-             _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"
-             _key-ref="oscal-profile:as-is"
-             _using-name="as-is"
-             _in-xml-name="as-is"
-             _in-json-name="as-is"
              gi="as-is"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -788,19 +469,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _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"
-             _key-ref="oscal-catalog-common:parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -816,20 +487,7 @@
    <xsl:template match="j:array[@key='hashes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="hash" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="*[@key='algorithm']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
@@ -843,15 +501,8 @@
    <xsl:template match="j:map[@key='profile']/j:string[@key='uuid']"><!-- XML match="profile/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-profile/profile/uuid"
-            _metaschema-json-id="/assembly/oscal-profile/profile/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -862,15 +513,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"><!-- XML match="prop/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -881,15 +525,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -898,18 +535,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"><!-- XML match="prop/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -919,15 +545,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"><!-- XML match="prop/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -938,15 +557,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"><!-- XML match="prop/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -957,15 +569,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"><!-- XML match="link/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -976,15 +581,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"><!-- XML match="link/@rel" -->
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -995,18 +593,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1018,15 +606,8 @@
                  priority="6"><!-- XML match="profile/metadata/document-id/@scheme | profile/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1035,18 +616,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"><!-- XML match="role/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1056,15 +626,8 @@
    <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"><!-- XML match="location/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1075,18 +638,8 @@
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="profile/metadata/location/address/@type | profile/metadata/party/address/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1098,15 +651,8 @@
                  priority="8"><!-- XML match="profile/metadata/location/telephone-number/@type | profile/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1117,15 +663,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"><!-- XML match="party/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1136,15 +675,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"><!-- XML match="party/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1156,15 +688,8 @@
                  priority="8"><!-- XML match="profile/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1175,15 +700,8 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1194,15 +712,8 @@
    <xsl:template match="j:array[@key='imports']/j:map/j:string[@key='href']"><!-- XML match="import/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-profile/import/href"
-            _metaschema-json-id="/assembly/oscal-profile/import/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1213,18 +724,8 @@
    <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls']"><!-- XML match="profile/import/include-controls/@with-child-controls | profile/import/exclude-controls/@with-child-controls | profile/merge/custom//group/insert-controls/include-controls/@with-child-controls | profile/merge/custom//group/insert-controls/exclude-controls/@with-child-controls | profile/merge/custom/insert-controls/include-controls/@with-child-controls | profile/merge/custom/insert-controls/exclude-controls/@with-child-controls" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-child-controls"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:with-child-controls"
-            _step="with-child-controls"
-            _key="with-child-controls"
-            _key-ref="oscal-profile:with-child-controls"
-            _using-name="with-child-controls"
-            _in-xml-name="with-child-controls"
-            _in-json-name="with-child-controls"
             gi="with-child-controls">
          <xsl:value-of select="."/>
       </flag>
@@ -1235,18 +736,8 @@
    <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern']"><!-- XML match="profile/import/include-controls/matching/@pattern | profile/import/exclude-controls/matching/@pattern | profile/merge/custom//group/insert-controls/include-controls/matching/@pattern | profile/merge/custom//group/insert-controls/exclude-controls/matching/@pattern | profile/merge/custom/insert-controls/include-controls/matching/@pattern | profile/merge/custom/insert-controls/exclude-controls/matching/@pattern" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching/pattern"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:pattern"
-            _step="pattern"
-            _key="pattern"
-            _key-ref="oscal-profile:pattern"
-            _using-name="pattern"
-            _in-xml-name="pattern"
-            _in-json-name="pattern"
             gi="pattern">
          <xsl:value-of select="."/>
       </flag>
@@ -1257,18 +748,8 @@
    <xsl:template match="j:map[@key='combine']/j:string[@key='method']"><!-- XML match="combine/@method" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-profile/combine/method"
-            _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/src/metaschema/oscal_profile_metaschema.xml"
-            _key-name="oscal-profile:method"
-            _step="method"
-            _key="method"
-            _key-ref="oscal-profile:method"
-            _using-name="method"
-            _in-xml-name="method"
-            _in-json-name="method"
             gi="method">
          <xsl:value-of select="."/>
       </flag>
@@ -1277,18 +758,7 @@
                  mode="keep-value-property"
                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']"><!-- XML match="group/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-profile/group/id"
-            _metaschema-json-id="/assembly/oscal-profile/group/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1298,15 +768,8 @@
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"><!-- XML match="group/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-profile/group/class"
-            _metaschema-json-id="/assembly/oscal-profile/group/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1315,18 +778,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='id']"><!-- XML match="param/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1336,15 +788,8 @@
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='class']"><!-- XML match="param/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1355,18 +800,8 @@
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='depends-on']"><!-- XML match="param/@depends-on" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/depends-on"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:depends-on"
-            _step="depends-on"
-            _key="depends-on"
-            _key-ref="oscal-catalog-common:depends-on"
-            _using-name="depends-on"
-            _in-xml-name="depends-on"
-            _in-json-name="depends-on"
             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
@@ -1377,15 +812,8 @@
    <xsl:template match="j:map[@key='select']/j:string[@key='how-many']"><!-- XML match="select/@how-many" -->
       <flag in-json="string"
             as-type="token"
-            _step="how-many"
-            _key="how-many"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
-            _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/how-many"
             name="how-many"
             key="how-many"
-            _using-name="how-many"
-            _in-xml-name="how-many"
-            _in-json-name="how-many"
             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
@@ -1394,18 +822,7 @@
                  mode="keep-value-property"
                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']"><!-- XML match="part/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/id"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1415,15 +832,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"><!-- XML match="part/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/name"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1432,18 +842,7 @@
                  mode="keep-value-property"
                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"><!-- XML match="part/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/ns"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1453,15 +852,8 @@
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"><!-- XML match="part/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-catalog-common/part/class"
-            _metaschema-json-id="/assembly/oscal-catalog-common/part/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1472,15 +864,8 @@
    <xsl:template match="j:array[@key='insert-controls']/j:map/j:string[@key='order']"><!-- XML match="insert-controls/@order" -->
       <flag in-json="string"
             as-type="token"
-            _step="order"
-            _key="order"
-            _metaschema-xml-id="/assembly/oscal-profile/insert-controls/order"
-            _metaschema-json-id="/assembly/oscal-profile/insert-controls/order"
             name="order"
             key="order"
-            _using-name="order"
-            _in-xml-name="order"
-            _in-json-name="order"
             gi="order">
          <xsl:value-of select="."/>
       </flag>
@@ -1492,15 +877,8 @@
                  priority="6"><!-- XML match="profile/modify/set-parameter/@param-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="param-id"
-            _key="param-id"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/param-id"
-            _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/param-id"
             name="param-id"
             key="param-id"
-            _using-name="param-id"
-            _in-xml-name="param-id"
-            _in-json-name="param-id"
             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1512,15 +890,8 @@
                  priority="6"><!-- XML match="profile/modify/set-parameter/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/class"
-            _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1531,18 +902,8 @@
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='depends-on']"><!-- XML match="profile/modify/set-parameter/@depends-on" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/depends-on"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:depends-on"
-            _step="depends-on"
-            _key="depends-on"
-            _key-ref="oscal-catalog-common:depends-on"
-            _using-name="depends-on"
-            _in-xml-name="depends-on"
-            _in-json-name="depends-on"
             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
@@ -1553,18 +914,8 @@
    <xsl:template match="j:array[@key='alters']/j:map/j:string[@key='control-id']"><!-- XML match="alter/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-profile/alter/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1575,15 +926,8 @@
    <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-name']"><!-- XML match="remove/@by-name" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-name"
-            _key="by-name"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-name"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-name"
             name="by-name"
             key="by-name"
-            _using-name="by-name"
-            _in-xml-name="by-name"
-            _in-json-name="by-name"
             gi="by-name">
          <xsl:value-of select="."/>
       </flag>
@@ -1594,15 +938,8 @@
    <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-class']"><!-- XML match="remove/@by-class" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-class"
-            _key="by-class"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-class"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-class"
             name="by-class"
             key="by-class"
-            _using-name="by-class"
-            _in-xml-name="by-class"
-            _in-json-name="by-class"
             gi="by-class">
          <xsl:value-of select="."/>
       </flag>
@@ -1613,15 +950,8 @@
    <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-id']"><!-- XML match="remove/@by-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-id"
-            _key="by-id"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-id"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-id"
             name="by-id"
             key="by-id"
-            _using-name="by-id"
-            _in-xml-name="by-id"
-            _in-json-name="by-id"
             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1632,15 +962,8 @@
    <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-item-name']"><!-- XML match="remove/@by-item-name" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-item-name"
-            _key="by-item-name"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-item-name"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-item-name"
             name="by-item-name"
             key="by-item-name"
-            _using-name="by-item-name"
-            _in-xml-name="by-item-name"
-            _in-json-name="by-item-name"
             gi="by-item-name">
          <xsl:value-of select="."/>
       </flag>
@@ -1651,15 +974,8 @@
    <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-ns']"><!-- XML match="remove/@by-ns" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-ns"
-            _key="by-ns"
-            _metaschema-xml-id="/assembly/oscal-profile/remove/by-ns"
-            _metaschema-json-id="/assembly/oscal-profile/remove/by-ns"
             name="by-ns"
             key="by-ns"
-            _using-name="by-ns"
-            _in-xml-name="by-ns"
-            _in-json-name="by-ns"
             gi="by-ns">
          <xsl:value-of select="."/>
       </flag>
@@ -1670,15 +986,8 @@
    <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='position']"><!-- XML match="add/@position" -->
       <flag in-json="string"
             as-type="token"
-            _step="position"
-            _key="position"
-            _metaschema-xml-id="/assembly/oscal-profile/add/position"
-            _metaschema-json-id="/assembly/oscal-profile/add/position"
             name="position"
             key="position"
-            _using-name="position"
-            _in-xml-name="position"
-            _in-json-name="position"
             gi="position">
          <xsl:value-of select="."/>
       </flag>
@@ -1689,15 +998,8 @@
    <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='by-id']"><!-- XML match="add/@by-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="by-id"
-            _key="by-id"
-            _metaschema-xml-id="/assembly/oscal-profile/add/by-id"
-            _metaschema-json-id="/assembly/oscal-profile/add/by-id"
             name="by-id"
             key="by-id"
-            _using-name="by-id"
-            _in-xml-name="by-id"
-            _in-json-name="by-id"
             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1709,15 +1011,8 @@
                  priority="6"><!-- XML match="profile/back-matter/resource/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1729,15 +1024,8 @@
                  priority="8"><!-- XML match="profile/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1748,18 +1036,8 @@
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="profile/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1770,15 +1048,8 @@
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -1790,15 +1061,8 @@
                  priority="7"><!-- XML match="profile/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -1809,18 +1073,8 @@
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="profile/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1832,17 +1086,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1862,20 +1109,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1895,20 +1132,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1928,20 +1155,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1961,20 +1178,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -1994,18 +1201,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -2024,10 +1220,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -2038,17 +1231,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2068,20 +1254,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2101,20 +1277,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2134,20 +1300,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2167,20 +1323,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2200,17 +1346,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2230,19 +1369,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2259,17 +1388,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2289,17 +1411,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2319,17 +1434,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2349,18 +1457,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2380,17 +1481,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2410,17 +1504,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2440,19 +1527,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -2468,19 +1543,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2497,17 +1562,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2527,17 +1585,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2557,17 +1608,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2587,17 +1631,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2617,19 +1654,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2646,19 +1673,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2675,16 +1692,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2701,17 +1711,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2731,17 +1734,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2761,17 +1757,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2791,16 +1780,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2817,17 +1799,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2847,19 +1822,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2876,19 +1841,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2905,18 +1860,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -2929,19 +1873,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2958,17 +1892,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2988,17 +1915,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3018,17 +1938,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3048,17 +1961,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3078,16 +1984,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3104,17 +2003,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3134,18 +2026,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/include-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -3155,16 +2036,9 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/include-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3181,16 +2055,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/include-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -3198,18 +2063,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/exclude-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -3219,16 +2073,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/exclude-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3245,16 +2092,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/exclude-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -3262,17 +2100,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-profile/group/title"
-             _metaschema-json-id="/assembly/oscal-profile/group/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3292,17 +2123,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3322,17 +2146,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3352,18 +2169,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3383,18 +2193,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3414,15 +2217,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -3431,17 +2226,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3461,9 +2249,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -3474,7 +2262,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -3485,16 +2273,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3511,17 +2292,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3541,17 +2315,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3571,9 +2338,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -3584,7 +2351,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -3595,17 +2362,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3625,18 +2385,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/include-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -3646,16 +2395,9 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/include-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3672,16 +2414,7 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/include-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -3689,18 +2422,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -3710,16 +2432,9 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3736,16 +2451,7 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -3753,18 +2459,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/include-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="include-controls"
-                _key="include-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="include-controls"
-                _in-xml-name="include-controls"
-                _in-json-name="include-controls"
-                gi="include-controls">
+      <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -3774,16 +2469,9 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/include-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3800,16 +2488,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/include-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -3817,18 +2496,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/exclude-controls" -->
-      <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/src/metaschema/oscal_profile_metaschema.xml"
-                _key-name="oscal-profile:select-control-by-id"
-                _step="exclude-controls"
-                _key="exclude-controls"
-                _key-ref="oscal-profile:select-control-by-id"
-                _using-name="exclude-controls"
-                _in-xml-name="exclude-controls"
-                _in-json-name="exclude-controls"
-                gi="exclude-controls">
+      <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="*[@key='with-child-controls']"/>
          <xsl:apply-templates select="*[@key='with-ids']"/>
          <xsl:apply-templates select="*[@key='matching']"/>
@@ -3838,16 +2506,9 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/exclude-controls/with-id" -->
-      <field _step="with-id"
-             _key="with-ids"
-             _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/with-id"
-             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="with-id"
-             _using-name="with-id"
-             _in-xml-name="with-id"
-             _in-json-name="with-ids"
              gi="with-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3864,16 +2525,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/exclude-controls/matching" -->
-      <assembly as-type="empty"
-                _step="matching"
-                _key="matching"
-                _metaschema-xml-id="/assembly/oscal-profile/select-control-by-id/matching"
-                _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching"
-                name="matching"
-                _using-name="matching"
-                _in-xml-name="matching"
-                _in-json-name="matching"
-                gi="matching">
+      <assembly as-type="empty" name="matching" gi="matching">
          <xsl:apply-templates select="*[@key='pattern']"/>
       </assembly>
    </xsl:template>
@@ -3881,15 +2533,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter" -->
-      <assembly _step="set-parameter"
-                _key="set-parameters"
-                _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter"
-                _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters"
-                name="set-parameter"
-                _using-name="set-parameter"
-                _in-xml-name="set-parameter"
-                _in-json-name="set-parameters"
-                gi="set-parameter">
+      <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="*[@key='param-id']"/>
          <xsl:apply-templates select="*[@key='class']"/>
          <xsl:apply-templates select="*[@key='depends-on']"/>
@@ -3907,17 +2551,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3937,17 +2574,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/label"
-             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3967,18 +2597,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-profile/modify/set-parameter/usage"
-             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3998,18 +2621,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4029,15 +2645,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -4046,17 +2654,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4076,9 +2677,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -4089,7 +2690,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -4100,16 +2701,9 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4126,17 +2720,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-profile/add/title"
-             _metaschema-json-id="/assembly/oscal-profile/add/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4156,17 +2743,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4186,17 +2766,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/label" -->
-      <field _step="label"
-             _key="label"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/label"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/label"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="label"
              key="label"
-             _using-name="label"
-             _in-xml-name="label"
-             _in-json-name="label"
              gi="label"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4216,18 +2789,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/usage" -->
-      <field _step="usage"
-             _key="usage"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/usage"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/usage"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="usage"
              key="usage"
-             _using-name="usage"
-             _in-xml-name="usage"
-             _in-json-name="usage"
              gi="usage"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4247,18 +2813,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/constraint/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4278,15 +2837,7 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/constraint/test" -->
-      <assembly _step="test"
-                _key="tests"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests"
-                name="test"
-                _using-name="test"
-                _in-xml-name="test"
-                _in-json-name="tests"
-                gi="test">
+      <assembly name="test" gi="test">
          <xsl:apply-templates select="*[@key='expression']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -4295,17 +2846,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/constraint/test/expression" -->
-      <field _step="expression"
-             _key="expression"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-constraint/test/expression"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-constraint/tests/expression"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="expression"
              key="expression"
-             _using-name="expression"
-             _in-xml-name="expression"
-             _in-json-name="expression"
              gi="expression"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4325,9 +2869,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -4338,7 +2882,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -4349,16 +2893,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/select/choice" -->
-      <field _step="choice"
-             _key="choice"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-selection/choice"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="parameter-choice"
-             _using-name="choice"
-             _in-xml-name="choice"
-             _in-json-name="choice"
              gi="choice"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4375,17 +2912,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4405,17 +2935,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add//part/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/title"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4435,9 +2958,9 @@
    <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"
+             _step="prose"
              _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
              in-xml="UNWRAPPED"
              collapsible="no"
@@ -4448,7 +2971,7 @@
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
                 in-json="string">
             <xsl:value-of select="."/>
@@ -4459,17 +2982,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add//part/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4489,15 +3005,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -4513,17 +3021,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4543,18 +3044,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4574,19 +3068,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -4603,16 +3087,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -4625,17 +3100,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4655,17 +3123,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4685,15 +3146,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -4703,17 +3156,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -4767,11 +3213,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 30077f77c1..92117df258 100644
--- a/xml/convert/oscal_ssp_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_ssp_json-to-xml-converter.xsl
@@ -74,13 +74,8 @@
    <xsl:template match="j:map[@key='system-security-plan']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan"
-                name="system-security-plan"
+      <assembly name="system-security-plan"
                 key="system-security-plan"
-                _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">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-security-plan</xsl:attribute>
@@ -100,19 +95,7 @@
    <xsl:template match="j:map[@key='metadata']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="metadata" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/metadata"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:metadata"
-                _step="metadata"
-                _key="metadata"
-                _key-ref="oscal-metadata:metadata"
-                _using-name="metadata"
-                _in-xml-name="metadata"
-                _in-json-name="metadata"
-                gi="metadata">
+      <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">metadata</xsl:attribute>
          </xsl:if>
@@ -135,18 +118,7 @@
    <xsl:template match="j:array[@key='props']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="prop" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:property"
-                _step="prop"
-                _key="props"
-                _key-ref="oscal-metadata:property"
-                _using-name="prop"
-                _in-xml-name="prop"
-                _in-json-name="props"
-                gi="prop">
+      <assembly name="property" gi="prop">
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='ns']"/>
@@ -158,18 +130,7 @@
    <xsl:template match="j:array[@key='links']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="link" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:link"
-                _step="link"
-                _key="links"
-                _key-ref="oscal-metadata:link"
-                _using-name="link"
-                _in-xml-name="link"
-                _in-json-name="links"
-                gi="link">
+      <assembly name="link" gi="link">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
@@ -179,18 +140,7 @@
    <xsl:template match="j:array[@key='roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:role"
-                _step="role"
-                _key="roles"
-                _key-ref="oscal-metadata:role"
-                _using-name="role"
-                _in-xml-name="role"
-                _in-json-name="roles"
-                gi="role">
+      <assembly name="role" gi="role">
          <xsl:apply-templates select="*[@key='id']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -203,18 +153,7 @@
    <xsl:template match="j:array[@key='locations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:location"
-                _step="location"
-                _key="locations"
-                _key-ref="oscal-metadata:location"
-                _using-name="location"
-                _in-xml-name="location"
-                _in-json-name="locations"
-                gi="location">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='address']"/>
@@ -229,18 +168,7 @@
    <xsl:template match="j:array[@key='parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:party"
-                _step="party"
-                _key="parties"
-                _key-ref="oscal-metadata:party"
-                _using-name="party"
-                _in-xml-name="party"
-                _in-json-name="parties"
-                gi="party">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='name']"/>
@@ -259,18 +187,7 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-party" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-party"
-                _step="responsible-party"
-                _key="responsible-parties"
-                _key-ref="oscal-metadata:responsible-party"
-                _using-name="responsible-party"
-                _in-xml-name="responsible-party"
-                _in-json-name="responsible-parties"
-                gi="responsible-party">
+      <assembly name="responsible-party" gi="responsible-party">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -281,19 +198,7 @@
    <xsl:template match="j:map[@key='import-profile']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-profile" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/import-profile"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:import-profile"
-                _step="import-profile"
-                _key="import-profile"
-                _key-ref="oscal-ssp:import-profile"
-                _using-name="import-profile"
-                _in-xml-name="import-profile"
-                _in-json-name="import-profile"
-                gi="import-profile">
+      <assembly name="import-profile" key="import-profile" gi="import-profile">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">import-profile</xsl:attribute>
          </xsl:if>
@@ -304,18 +209,8 @@
    <xsl:template match="j:map[@key='system-characteristics']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-characteristics" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
-                name="system-characteristics"
+      <assembly name="system-characteristics"
                 key="system-characteristics"
-                _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"
-                _key-ref="oscal-ssp:system-characteristics"
-                _using-name="system-characteristics"
-                _in-xml-name="system-characteristics"
-                _in-json-name="system-characteristics"
                 gi="system-characteristics">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-characteristics</xsl:attribute>
@@ -341,18 +236,8 @@
    <xsl:template match="j:map[@key='system-information']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-information" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-information"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-information"
-                name="system-information"
+      <assembly name="system-information"
                 key="system-information"
-                _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"
-                _key-ref="oscal-ssp:system-information"
-                _using-name="system-information"
-                _in-xml-name="system-information"
-                _in-json-name="system-information"
                 gi="system-information">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-information</xsl:attribute>
@@ -365,18 +250,8 @@
    <xsl:template match="j:map[@key='security-impact-level']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="security-impact-level" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
-                name="security-impact-level"
+      <assembly name="security-impact-level"
                 key="security-impact-level"
-                _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"
-                _key-ref="oscal-ssp:security-impact-level"
-                _using-name="security-impact-level"
-                _in-xml-name="security-impact-level"
-                _in-json-name="security-impact-level"
                 gi="security-impact-level">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-impact-level</xsl:attribute>
@@ -389,18 +264,8 @@
    <xsl:template match="j:map[@key='authorization-boundary']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="authorization-boundary" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
-                name="authorization-boundary"
+      <assembly name="authorization-boundary"
                 key="authorization-boundary"
-                _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"
-                _key-ref="oscal-ssp:authorization-boundary"
-                _using-name="authorization-boundary"
-                _in-xml-name="authorization-boundary"
-                _in-json-name="authorization-boundary"
                 gi="authorization-boundary">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">authorization-boundary</xsl:attribute>
@@ -415,18 +280,7 @@
    <xsl:template match="j:array[@key='diagrams']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="diagram" -->
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:diagram"
-                _step="diagram"
-                _key="diagrams"
-                _key-ref="oscal-ssp:diagram"
-                _using-name="diagram"
-                _in-xml-name="diagram"
-                _in-json-name="diagrams"
-                gi="diagram">
+      <assembly name="diagram" gi="diagram">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -438,18 +292,8 @@
    <xsl:template match="j:map[@key='network-architecture']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="network-architecture" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
-                _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
-                name="network-architecture"
+      <assembly name="network-architecture"
                 key="network-architecture"
-                _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"
-                _key-ref="oscal-ssp:network-architecture"
-                _using-name="network-architecture"
-                _in-xml-name="network-architecture"
-                _in-json-name="network-architecture"
                 gi="network-architecture">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">network-architecture</xsl:attribute>
@@ -464,19 +308,7 @@
    <xsl:template match="j:map[@key='data-flow']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="data-flow" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/data-flow"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:data-flow"
-                _step="data-flow"
-                _key="data-flow"
-                _key-ref="oscal-ssp:data-flow"
-                _using-name="data-flow"
-                _in-xml-name="data-flow"
-                _in-json-name="data-flow"
-                gi="data-flow">
+      <assembly name="data-flow" key="data-flow" gi="data-flow">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">data-flow</xsl:attribute>
          </xsl:if>
@@ -490,18 +322,8 @@
    <xsl:template match="j:map[@key='system-implementation']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-implementation" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
-                name="system-implementation"
+      <assembly name="system-implementation"
                 key="system-implementation"
-                _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"
-                _key-ref="oscal-ssp:system-implementation"
-                _using-name="system-implementation"
-                _in-xml-name="system-implementation"
-                _in-json-name="system-implementation"
                 gi="system-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-implementation</xsl:attribute>
@@ -518,18 +340,7 @@
    <xsl:template match="j:array[@key='users']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="user" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-user"
-                _step="user"
-                _key="users"
-                _key-ref="oscal-implementation-common:system-user"
-                _using-name="user"
-                _in-xml-name="user"
-                _in-json-name="users"
-                gi="user">
+      <assembly name="system-user" gi="user">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='short-name']"/>
@@ -544,18 +355,7 @@
    <xsl:template match="j:array[@key='authorized-privileges']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="authorized-privilege" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:authorized-privilege"
-                _step="authorized-privilege"
-                _key="authorized-privileges"
-                _key-ref="oscal-implementation-common:authorized-privilege"
-                _using-name="authorized-privilege"
-                _in-xml-name="authorized-privilege"
-                _in-json-name="authorized-privileges"
-                gi="authorized-privilege">
+      <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='functions-performed']"/>
@@ -564,18 +364,7 @@
    <xsl:template match="j:array[@key='components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:system-component"
-                _step="component"
-                _key="components"
-                _key-ref="oscal-implementation-common:system-component"
-                _using-name="component"
-                _in-xml-name="component"
-                _in-json-name="components"
-                gi="component">
+      <assembly name="system-component" gi="component">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -592,18 +381,7 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="responsible-role" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:responsible-role"
-                _step="responsible-role"
-                _key="responsible-roles"
-                _key-ref="oscal-metadata:responsible-role"
-                _using-name="responsible-role"
-                _in-xml-name="responsible-role"
-                _in-json-name="responsible-roles"
-                gi="responsible-role">
+      <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="*[@key='role-id']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -614,18 +392,7 @@
    <xsl:template match="j:array[@key='protocols']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="protocol" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:protocol"
-                _step="protocol"
-                _key="protocols"
-                _key-ref="oscal-implementation-common:protocol"
-                _using-name="protocol"
-                _in-xml-name="protocol"
-                _in-json-name="protocols"
-                gi="protocol">
+      <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='name']"/>
          <xsl:apply-templates select="*[@key='title']"/>
@@ -635,19 +402,7 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="port-range" -->
-      <assembly as-type="empty"
-                _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:port-range"
-                _step="port-range"
-                _key="port-ranges"
-                _key-ref="oscal-implementation-common:port-range"
-                _using-name="port-range"
-                _in-xml-name="port-range"
-                _in-json-name="port-ranges"
-                gi="port-range">
+      <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="*[@key='start']"/>
          <xsl:apply-templates select="*[@key='end']"/>
          <xsl:apply-templates select="*[@key='transport']"/>
@@ -656,18 +411,7 @@
    <xsl:template match="j:array[@key='inventory-items']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="inventory-item" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:inventory-item"
-                _step="inventory-item"
-                _key="inventory-items"
-                _key-ref="oscal-implementation-common:inventory-item"
-                _using-name="inventory-item"
-                _in-xml-name="inventory-item"
-                _in-json-name="inventory-items"
-                gi="inventory-item">
+      <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -680,18 +424,7 @@
    <xsl:template match="j:array[@key='set-parameters']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="set-parameter" -->
-      <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/src/metaschema/oscal_implementation-common_metaschema.xml"
-                _key-name="oscal-implementation-common:set-parameter"
-                _step="set-parameter"
-                _key="set-parameters"
-                _key-ref="oscal-implementation-common:set-parameter"
-                _using-name="set-parameter"
-                _in-xml-name="set-parameter"
-                _in-json-name="set-parameters"
-                gi="set-parameter">
+      <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="*[@key='param-id']"/>
          <xsl:apply-templates select="*[@key='values']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
@@ -700,18 +433,7 @@
    <xsl:template match="j:array[@key='by-components']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="by-component" -->
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:by-component"
-                _step="by-component"
-                _key="by-components"
-                _key-ref="oscal-ssp:by-component"
-                _using-name="by-component"
-                _in-xml-name="by-component"
-                _in-json-name="by-components"
-                gi="by-component">
+      <assembly name="by-component" gi="by-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -729,18 +451,8 @@
    <xsl:template match="j:map[@key='implementation-status']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="implementation-status" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/by-component/implementation-status"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/implementation-status"
-                name="implementation-status"
+      <assembly name="implementation-status"
                 key="implementation-status"
-                _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"
-                _key-ref="oscal-implementation-common:implementation-status"
-                _using-name="implementation-status"
-                _in-xml-name="implementation-status"
-                _in-json-name="implementation-status"
                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
@@ -752,19 +464,7 @@
    <xsl:template match="j:map[@key='back-matter']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="back-matter" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/back-matter"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:back-matter"
-                _step="back-matter"
-                _key="back-matter"
-                _key-ref="oscal-metadata:back-matter"
-                _using-name="back-matter"
-                _in-xml-name="back-matter"
-                _in-json-name="back-matter"
-                gi="back-matter">
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">back-matter</xsl:attribute>
          </xsl:if>
@@ -774,21 +474,11 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/property/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _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"
-             _key-ref="oscal-metadata:remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -807,19 +497,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/party/location-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _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"
-             _key-ref="oscal-metadata:location-uuid"
-             _using-name="location-uuid"
-             _in-xml-name="location-uuid"
-             _in-json-name="location-uuids"
              gi="location-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -835,19 +515,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-metadata/responsible-party/party-uuids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _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"
-             _key-ref="oscal-metadata:party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuids"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -863,19 +533,9 @@
    <xsl:template match="j:array[@key='system-ids']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-id"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-id"
-             _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"
-             _key-ref="oscal-implementation-common:system-id"
-             _using-name="system-id"
-             _in-xml-name="system-id"
-             _in-json-name="system-ids"
              gi="system-id">
          <xsl:apply-templates select="*[@key='identifier-type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -890,19 +550,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/role-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="token"
              name="role-id"
-             _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"
-             _key-ref="oscal-metadata:role-id"
-             _using-name="role-id"
-             _in-xml-name="role-id"
-             _in-json-name="role-ids"
              gi="role-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -918,19 +568,9 @@
    <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"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/functions-performed"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="function-performed"
-             _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"
-             _key-ref="oscal-implementation-common:function-performed"
-             _using-name="function-performed"
-             _in-xml-name="function-performed"
-             _in-json-name="functions-performed"
              gi="function-performed"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -946,20 +586,7 @@
    <xsl:template match="j:array[@key='hashes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="hash" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/hash"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/hashes"
-             collapsible="no"
-             as-type="string"
-             name="hash"
-             _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"
-             _key-ref="oscal-metadata:hash"
-             _using-name="hash"
-             _in-xml-name="hash"
-             _in-json-name="hashes"
-             gi="hash">
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="*[@key='algorithm']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
@@ -973,15 +600,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:string[@key='uuid']"><!-- XML match="system-security-plan/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -992,15 +612,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"><!-- XML match="prop/@name" -->
       <flag in-json="string"
             as-type="token"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/name"
-            _metaschema-json-id="/assembly/oscal-metadata/property/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1011,15 +624,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/property/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1028,18 +634,7 @@
                  mode="keep-value-property"
                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"><!-- XML match="prop/@ns" -->
-      <flag in-json="string"
-            as-type="uri"
-            _step="ns"
-            _key="ns"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/ns"
-            _metaschema-json-id="/assembly/oscal-metadata/property/ns"
-            name="ns"
-            key="ns"
-            _using-name="ns"
-            _in-xml-name="ns"
-            _in-json-name="ns"
-            gi="ns">
+      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1049,15 +644,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"><!-- XML match="prop/@value" -->
       <flag in-json="string"
             as-type="string"
-            _step="value"
-            _key="value"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/value"
-            _metaschema-json-id="/assembly/oscal-metadata/property/value"
             name="value"
             key="value"
-            _using-name="value"
-            _in-xml-name="value"
-            _in-json-name="value"
             gi="value">
          <xsl:value-of select="."/>
       </flag>
@@ -1068,15 +656,8 @@
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"><!-- XML match="prop/@class" -->
       <flag in-json="string"
             as-type="token"
-            _step="class"
-            _key="class"
-            _metaschema-xml-id="/assembly/oscal-metadata/property/class"
-            _metaschema-json-id="/assembly/oscal-metadata/property/class"
             name="class"
             key="class"
-            _using-name="class"
-            _in-xml-name="class"
-            _in-json-name="class"
             gi="class">
          <xsl:value-of select="."/>
       </flag>
@@ -1087,15 +668,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"><!-- XML match="link/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/href"
-            _metaschema-json-id="/assembly/oscal-metadata/link/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1106,15 +680,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"><!-- XML match="link/@rel" -->
       <flag in-json="string"
             as-type="token"
-            _step="rel"
-            _key="rel"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/rel"
-            _metaschema-json-id="/assembly/oscal-metadata/link/rel"
             name="rel"
             key="rel"
-            _using-name="rel"
-            _in-xml-name="rel"
-            _in-json-name="rel"
             gi="rel">
          <xsl:value-of select="."/>
       </flag>
@@ -1125,18 +692,8 @@
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/link/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1148,15 +705,8 @@
                  priority="6"><!-- XML match="system-security-plan/metadata/document-id/@scheme | system-security-plan/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/field/oscal-metadata/document-id/scheme"
-            _metaschema-json-id="/field/oscal-metadata/document-id/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1165,18 +715,7 @@
                  mode="keep-value-property"
                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"><!-- XML match="role/@id" -->
-      <flag in-json="string"
-            as-type="token"
-            _step="id"
-            _key="id"
-            _metaschema-xml-id="/assembly/oscal-metadata/role/id"
-            _metaschema-json-id="/assembly/oscal-metadata/role/id"
-            name="id"
-            key="id"
-            _using-name="id"
-            _in-xml-name="id"
-            _in-json-name="id"
-            gi="id">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
@@ -1186,15 +725,8 @@
    <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"><!-- XML match="location/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/location/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/location/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1205,18 +737,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="system-security-plan/metadata/location/address/@type | system-security-plan/metadata/party/address/@type" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-metadata/address/type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:location-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-metadata:location-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1228,15 +750,8 @@
                  priority="8"><!-- XML match="system-security-plan/metadata/location/telephone-number/@type | system-security-plan/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/field/oscal-metadata/telephone-number/type"
-            _metaschema-json-id="/field/oscal-metadata/telephone-number/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1247,15 +762,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"><!-- XML match="party/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/party/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1266,15 +774,8 @@
    <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"><!-- XML match="party/@type" -->
       <flag in-json="string"
             as-type="string"
-            _step="type"
-            _key="type"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/type"
-            _metaschema-json-id="/assembly/oscal-metadata/party/type"
             name="type"
             key="type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1286,15 +787,8 @@
                  priority="8"><!-- XML match="system-security-plan/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
             as-type="uri"
-            _step="scheme"
-            _key="scheme"
-            _metaschema-xml-id="/assembly/oscal-metadata/party/external-id/scheme"
-            _metaschema-json-id="/assembly/oscal-metadata/party/external-ids/scheme"
             name="scheme"
             key="scheme"
-            _using-name="scheme"
-            _in-xml-name="scheme"
-            _in-json-name="scheme"
             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
@@ -1305,15 +799,8 @@
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-party/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1324,15 +811,8 @@
    <xsl:template match="j:map[@key='import-profile']/j:string[@key='href']"><!-- XML match="import-profile/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-ssp/import-profile/href"
-            _metaschema-json-id="/assembly/oscal-ssp/import-profile/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -1343,15 +823,8 @@
    <xsl:template match="j:array[@key='system-ids']/j:map/j:string[@key='identifier-type']"><!-- XML match="system-id/@identifier-type" -->
       <flag in-json="string"
             as-type="uri"
-            _step="identifier-type"
-            _key="identifier-type"
-            _metaschema-xml-id="/field/oscal-implementation-common/system-id/identifier-type"
-            _metaschema-json-id="/field/oscal-implementation-common/system-id/identifier-type"
             name="identifier-type"
             key="identifier-type"
-            _using-name="identifier-type"
-            _in-xml-name="identifier-type"
-            _in-json-name="identifier-type"
             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
@@ -1363,15 +836,8 @@
                  priority="7"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1383,15 +849,8 @@
                  priority="9"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/@system" -->
       <flag in-json="string"
             as-type="uri"
-            _step="system"
-            _key="system"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization/system"
-            _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations/system"
             name="system"
             key="system"
-            _using-name="system"
-            _in-xml-name="system"
-            _in-json-name="system"
             gi="system">
          <xsl:value-of select="."/>
       </flag>
@@ -1403,15 +862,8 @@
                  priority="5"><!-- XML match="system-security-plan/system-characteristics/status/@state" -->
       <flag in-json="string"
             as-type="string"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-ssp/status/state"
-            _metaschema-json-id="/assembly/oscal-ssp/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -1422,15 +874,8 @@
    <xsl:template match="j:array[@key='diagrams']/j:map/j:string[@key='uuid']"><!-- XML match="diagram/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/diagram/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/diagram/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1442,15 +887,8 @@
                  priority="6"><!-- XML match="system-security-plan/system-implementation/leveraged-authorization/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1461,15 +899,8 @@
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']"><!-- XML match="user/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-user/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1480,15 +911,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1499,18 +923,8 @@
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/type"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:system-component-type"
-            _step="type"
-            _key="type"
-            _key-ref="oscal-implementation-common:system-component-type"
-            _using-name="type"
-            _in-xml-name="type"
-            _in-json-name="type"
             gi="type">
          <xsl:value-of select="."/>
       </flag>
@@ -1522,15 +936,8 @@
                  priority="7"><!-- XML match="system-security-plan/system-implementation/component/status/@state" -->
       <flag in-json="string"
             as-type="token"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -1541,15 +948,8 @@
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
             as-type="token"
-            _step="role-id"
-            _key="role-id"
-            _metaschema-xml-id="/assembly/oscal-metadata/responsible-role/role-id"
-            _metaschema-json-id="/assembly/oscal-metadata/responsible-role/role-id"
             name="role-id"
             key="role-id"
-            _using-name="role-id"
-            _in-xml-name="role-id"
-            _in-json-name="role-id"
             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1560,15 +960,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1579,15 +972,8 @@
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
             as-type="string"
-            _step="name"
-            _key="name"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/name"
-            _metaschema-json-id="/assembly/oscal-implementation-common/protocol/name"
             name="name"
             key="name"
-            _using-name="name"
-            _in-xml-name="name"
-            _in-json-name="name"
             gi="name">
          <xsl:value-of select="."/>
       </flag>
@@ -1598,15 +984,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="start"
-            _key="start"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/start"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/start"
             name="start"
             key="start"
-            _using-name="start"
-            _in-xml-name="start"
-            _in-json-name="start"
             gi="start">
          <xsl:value-of select="."/>
       </flag>
@@ -1617,15 +996,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
             as-type="nonNegativeInteger"
-            _step="end"
-            _key="end"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/end"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/end"
             name="end"
             key="end"
-            _using-name="end"
-            _in-xml-name="end"
-            _in-json-name="end"
             gi="end">
          <xsl:value-of select="."/>
       </flag>
@@ -1636,15 +1008,8 @@
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
             as-type="token"
-            _step="transport"
-            _key="transport"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/port-range/transport"
-            _metaschema-json-id="/assembly/oscal-implementation-common/port-range/transport"
             name="transport"
             key="transport"
-            _using-name="transport"
-            _in-xml-name="transport"
-            _in-json-name="transport"
             gi="transport">
          <xsl:value-of select="."/>
       </flag>
@@ -1655,15 +1020,8 @@
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"><!-- XML match="inventory-item/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1675,15 +1033,8 @@
                  priority="8"><!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1694,18 +1045,8 @@
    <xsl:template match="j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"><!-- XML match="set-parameter/@param-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/param-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:param-id"
-            _step="param-id"
-            _key="param-id"
-            _key-ref="oscal-implementation-common:param-id"
-            _using-name="param-id"
-            _in-xml-name="param-id"
-            _in-json-name="param-id"
             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1717,15 +1058,8 @@
                  priority="6"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1736,18 +1070,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/@control-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/control-id"
-            _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/src/metaschema/oscal_control-common_metaschema.xml"
-            _key-name="oscal-catalog-common:control-id"
-            _step="control-id"
-            _key="control-id"
-            _key-ref="oscal-catalog-common:control-id"
-            _using-name="control-id"
-            _in-xml-name="control-id"
-            _in-json-name="control-id"
             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1758,18 +1082,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/@statement-id" -->
       <flag in-json="string"
             as-type="token"
-            _metaschema-xml-id="/assembly/oscal-ssp/statement/statement-id"
-            _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/src/metaschema/oscal_implementation-common_metaschema.xml"
-            _key-name="oscal-implementation-common:statement-id"
-            _step="statement-id"
-            _key="statement-id"
-            _key-ref="oscal-implementation-common:statement-id"
-            _using-name="statement-id"
-            _in-xml-name="statement-id"
-            _in-json-name="statement-id"
             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
@@ -1781,15 +1095,8 @@
                  priority="8"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/statement/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/statement/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1800,15 +1107,8 @@
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='component-uuid']"><!-- XML match="by-component/@component-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="component-uuid"
-            _key="component-uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/component-uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/component-uuid"
             name="component-uuid"
             key="component-uuid"
-            _using-name="component-uuid"
-            _in-xml-name="component-uuid"
-            _in-json-name="component-uuid"
             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1819,15 +1119,8 @@
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='uuid']"><!-- XML match="by-component/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1838,15 +1131,8 @@
    <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"><!-- XML match="implementation-status/@state" -->
       <flag in-json="string"
             as-type="token"
-            _step="state"
-            _key="state"
-            _metaschema-xml-id="/assembly/oscal-implementation-common/implementation-status/state"
-            _metaschema-json-id="/assembly/oscal-implementation-common/implementation-status/state"
             name="state"
             key="state"
-            _using-name="state"
-            _in-xml-name="state"
-            _in-json-name="state"
             gi="state">
          <xsl:value-of select="."/>
       </flag>
@@ -1858,15 +1144,8 @@
                  priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1878,15 +1157,8 @@
                  priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1897,18 +1169,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@provided-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/provided-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:provided-uuid"
-            _step="provided-uuid"
-            _key="provided-uuid"
-            _key-ref="oscal-ssp:provided-uuid"
-            _using-name="provided-uuid"
-            _in-xml-name="provided-uuid"
-            _in-json-name="provided-uuid"
             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1920,15 +1182,8 @@
                  priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1939,18 +1194,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@provided-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/provided-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:provided-uuid"
-            _step="provided-uuid"
-            _key="provided-uuid"
-            _key-ref="oscal-ssp:provided-uuid"
-            _using-name="provided-uuid"
-            _in-xml-name="provided-uuid"
-            _in-json-name="provided-uuid"
             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1962,15 +1207,8 @@
                  priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/uuid"
-            _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -1981,18 +1219,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@responsibility-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@responsibility-uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/responsibility-uuid"
-            _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/src/metaschema/oscal_ssp_metaschema.xml"
-            _key-name="oscal-ssp:responsibility-uuid"
-            _step="responsibility-uuid"
-            _key="responsibility-uuid"
-            _key-ref="oscal-ssp:responsibility-uuid"
-            _using-name="responsibility-uuid"
-            _in-xml-name="responsibility-uuid"
-            _in-json-name="responsibility-uuid"
             gi="responsibility-uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2004,15 +1232,8 @@
                  priority="6"><!-- XML match="system-security-plan/back-matter/resource/@uuid" -->
       <flag in-json="string"
             as-type="uuid"
-            _step="uuid"
-            _key="uuid"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/uuid"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/uuid"
             name="uuid"
             key="uuid"
-            _using-name="uuid"
-            _in-xml-name="uuid"
-            _in-json-name="uuid"
             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
@@ -2024,15 +1245,8 @@
                  priority="8"><!-- XML match="system-security-plan/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="href"
-            _key="href"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/href"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/href"
             name="href"
             key="href"
-            _using-name="href"
-            _in-xml-name="href"
-            _in-json-name="href"
             gi="href">
          <xsl:value-of select="."/>
       </flag>
@@ -2043,18 +1257,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="system-security-plan/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2065,15 +1269,8 @@
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
             as-type="string"
-            _step="algorithm"
-            _key="algorithm"
-            _metaschema-xml-id="/field/oscal-metadata/hash/algorithm"
-            _metaschema-json-id="/field/oscal-metadata/hash/algorithm"
             name="algorithm"
             key="algorithm"
-            _using-name="algorithm"
-            _in-xml-name="algorithm"
-            _in-json-name="algorithm"
             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
@@ -2085,15 +1282,8 @@
                  priority="7"><!-- XML match="system-security-plan/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
             as-type="uri-reference"
-            _step="filename"
-            _key="filename"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/filename"
-            _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/filename"
             name="filename"
             key="filename"
-            _using-name="filename"
-            _in-xml-name="filename"
-            _in-json-name="filename"
             gi="filename">
          <xsl:value-of select="."/>
       </flag>
@@ -2104,18 +1294,8 @@
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="system-security-plan/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
             as-type="string"
-            _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64/media-type"
-            _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/src/metaschema/oscal_metadata_metaschema.xml"
-            _key-name="oscal-metadata:media-type"
-            _step="media-type"
-            _key="media-type"
-            _key-ref="oscal-metadata:media-type"
-            _using-name="media-type"
-            _in-xml-name="media-type"
-            _in-json-name="media-type"
             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
@@ -2127,17 +1307,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/metadata/title"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2157,20 +1330,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/published"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2190,20 +1353,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2223,20 +1376,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2256,20 +1399,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2289,18 +1422,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:revision"
-                _step="revisions/revision"
-                _key="revisions"
-                _key-ref="oscal-metadata:revision"
-                _using-name="revision"
-                _in-xml-name="revision"
-                _in-json-name="revisions"
-                gi="revision">
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
          <xsl:apply-templates select="*[@key='last-modified']"/>
@@ -2319,10 +1441,7 @@
              gi="revisions"
              group-json="ARRAY"
              name="revision"
-             key="revisions"
-             _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">
+             key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -2333,17 +1452,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/revision/title"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2363,20 +1475,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/published" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/published"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/published"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _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"
-             _key-ref="oscal-metadata:published"
-             _using-name="published"
-             _in-xml-name="published"
-             _in-json-name="published"
              gi="published"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2396,20 +1498,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/last-modified" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/last-modified"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/last-modified"
-             collapsible="no"
+      <field collapsible="no"
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _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"
-             _key-ref="oscal-metadata:last-modified"
-             _using-name="last-modified"
-             _in-xml-name="last-modified"
-             _in-json-name="last-modified"
              gi="last-modified"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2429,20 +1521,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="version"
              key="version"
-             _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"
-             _key-ref="oscal-metadata:version"
-             _using-name="version"
-             _in-xml-name="version"
-             _in-json-name="version"
              gi="version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2462,20 +1544,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/oscal-version" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/revision/oscal-version"
-             _metaschema-json-id="/assembly/oscal-metadata/revision/oscal-version"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _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"
-             _key-ref="oscal-metadata:oscal-version"
-             _using-name="oscal-version"
-             _in-xml-name="oscal-version"
-             _in-json-name="oscal-version"
              gi="oscal-version"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2495,17 +1567,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2525,19 +1590,9 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/metadata/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/metadata/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2554,17 +1609,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2584,17 +1632,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/title"
-             _metaschema-json-id="/assembly/oscal-metadata/role/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2614,17 +1655,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/role/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2644,18 +1678,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/role/description"
-             _metaschema-json-id="/assembly/oscal-metadata/role/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2675,17 +1702,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2705,17 +1725,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/title"
-             _metaschema-json-id="/assembly/oscal-metadata/location/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2735,19 +1748,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-metadata/location/address"
-                _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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="address"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="address"
-                gi="address">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
@@ -2763,19 +1764,9 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2792,17 +1783,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2822,17 +1806,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2852,17 +1829,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2882,17 +1852,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -2912,19 +1875,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/location/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2941,19 +1894,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/location/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/location/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2970,16 +1913,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/url" -->
-      <field _step="url"
-             _key="urls"
-             _metaschema-xml-id="/assembly/oscal-metadata/location/url"
-             _metaschema-json-id="/assembly/oscal-metadata/location/urls"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uri"
              name="url"
-             _using-name="url"
-             _in-xml-name="url"
-             _in-json-name="urls"
              gi="url"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -2996,17 +1932,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3026,17 +1955,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/name" -->
-      <field _step="name"
-             _key="name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="name"
              key="name"
-             _using-name="name"
-             _in-xml-name="name"
-             _in-json-name="name"
              gi="name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3056,17 +1978,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/short-name"
-             _metaschema-json-id="/assembly/oscal-metadata/party/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3086,16 +2001,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/external-id" -->
-      <field _step="external-id"
-             _key="external-ids"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/external-id"
-             _metaschema-json-id="/assembly/oscal-metadata/party/external-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="external-id"
-             _using-name="external-id"
-             _in-xml-name="external-id"
-             _in-json-name="external-ids"
              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3112,17 +2020,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3142,19 +2043,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/email-address" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/email-address"
-             _metaschema-json-id="/assembly/oscal-metadata/party/email-addresses"
-             collapsible="no"
+      <field collapsible="no"
              as-type="email"
              name="email-address"
-             _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"
-             _key-ref="oscal-metadata:email-address"
-             _using-name="email-address"
-             _in-xml-name="email-address"
-             _in-json-name="email-addresses"
              gi="email-address"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3171,19 +2062,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/telephone-number" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/party/telephone-number"
-             _metaschema-json-id="/assembly/oscal-metadata/party/telephone-numbers"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="telephone-number"
-             _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"
-             _key-ref="oscal-metadata:telephone-number"
-             _using-name="telephone-number"
-             _in-xml-name="telephone-number"
-             _in-json-name="telephone-numbers"
              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3200,18 +2081,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address" -->
-      <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/src/metaschema/oscal_metadata_metaschema.xml"
-                _key-name="oscal-metadata:address"
-                _step="address"
-                _key="addresses"
-                _key-ref="oscal-metadata:address"
-                _using-name="address"
-                _in-xml-name="address"
-                _in-json-name="addresses"
-                gi="address">
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
          <xsl:apply-templates select="*[@key='city']"/>
@@ -3224,19 +2094,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/addr-line" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/address/addr-line"
-             _metaschema-json-id="/assembly/oscal-metadata/address/addr-lines"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="addr-line"
-             _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"
-             _key-ref="oscal-metadata:addr-line"
-             _using-name="addr-line"
-             _in-xml-name="addr-line"
-             _in-json-name="addr-lines"
              gi="addr-line"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3253,17 +2113,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/city" -->
-      <field _step="city"
-             _key="city"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/city"
-             _metaschema-json-id="/assembly/oscal-metadata/address/city"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="city"
              key="city"
-             _using-name="city"
-             _in-xml-name="city"
-             _in-json-name="city"
              gi="city"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3283,17 +2136,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/state" -->
-      <field _step="state"
-             _key="state"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/state"
-             _metaschema-json-id="/assembly/oscal-metadata/address/state"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="state"
              key="state"
-             _using-name="state"
-             _in-xml-name="state"
-             _in-json-name="state"
              gi="state"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3313,17 +2159,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/postal-code" -->
-      <field _step="postal-code"
-             _key="postal-code"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/postal-code"
-             _metaschema-json-id="/assembly/oscal-metadata/address/postal-code"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="postal-code"
              key="postal-code"
-             _using-name="postal-code"
-             _in-xml-name="postal-code"
-             _in-json-name="postal-code"
              gi="postal-code"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3343,17 +2182,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/country" -->
-      <field _step="country"
-             _key="country"
-             _metaschema-xml-id="/assembly/oscal-metadata/address/country"
-             _metaschema-json-id="/assembly/oscal-metadata/address/country"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="country"
              key="country"
-             _using-name="country"
-             _in-xml-name="country"
-             _in-json-name="country"
              gi="country"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3373,16 +2205,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/member-of-organization" -->
-      <field _step="member-of-organization"
-             _key="member-of-organizations"
-             _metaschema-xml-id="/assembly/oscal-metadata/party/member-of-organization"
-             _metaschema-json-id="/assembly/oscal-metadata/party/member-of-organizations"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="member-of-organization"
-             _using-name="member-of-organization"
-             _in-xml-name="member-of-organization"
-             _in-json-name="member-of-organizations"
              gi="member-of-organization"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3399,17 +2224,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3429,17 +2247,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-name" -->
-      <field _step="system-name"
-             _key="system-name"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-name"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-name"
              key="system-name"
-             _using-name="system-name"
-             _in-xml-name="system-name"
-             _in-json-name="system-name"
              gi="system-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3459,17 +2270,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-name-short" -->
-      <field _step="system-name-short"
-             _key="system-name-short"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/system-name-short"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-name-short"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="system-name-short"
              key="system-name-short"
-             _using-name="system-name-short"
-             _in-xml-name="system-name-short"
-             _in-json-name="system-name-short"
              gi="system-name-short"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3489,18 +2293,11 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/description"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3520,17 +2317,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3550,20 +2340,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/date-authorized" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/date-authorized"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/date-authorized"
-             collapsible="no"
+      <field collapsible="no"
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _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"
-             _key-ref="oscal-ssp:date-authorized"
-             _using-name="date-authorized"
-             _in-xml-name="date-authorized"
-             _in-json-name="date-authorized"
              gi="date-authorized"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3583,17 +2363,10 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-sensitivity-level" -->
-      <field _step="security-sensitivity-level"
-             _key="security-sensitivity-level"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/security-sensitivity-level"
-             _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-sensitivity-level"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-sensitivity-level"
              key="security-sensitivity-level"
-             _using-name="security-sensitivity-level"
-             _in-xml-name="security-sensitivity-level"
-             _in-json-name="security-sensitivity-level"
              gi="security-sensitivity-level"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3613,17 +2386,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3643,15 +2409,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type" -->
-      <assembly _step="information-type"
-                _key="information-types"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types"
-                name="information-type"
-                _using-name="information-type"
-                _in-xml-name="information-type"
-                _in-json-name="information-types"
-                gi="information-type">
+      <assembly name="information-type" gi="information-type">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -3667,17 +2425,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/title"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3697,18 +2448,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/description"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3728,15 +2472,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization" -->
-      <assembly _step="categorization"
-                _key="categorizations"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations"
-                name="categorization"
-                _using-name="categorization"
-                _in-xml-name="categorization"
-                _in-json-name="categorizations"
-                gi="categorization">
+      <assembly name="categorization" gi="categorization">
          <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='information-type-ids']"/>
       </assembly>
@@ -3745,16 +2481,9 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/information-type-id" -->
-      <field _step="information-type-id"
-             _key="information-type-ids"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/categorization/information-type-id"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/categorizations/information-type-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="information-type-id"
-             _using-name="information-type-id"
-             _in-xml-name="information-type-id"
-             _in-json-name="information-type-ids"
              gi="information-type-id"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -3771,17 +2500,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3801,15 +2523,8 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact" -->
-      <assembly _step="confidentiality-impact"
-                _key="confidentiality-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact"
-                name="confidentiality-impact"
+      <assembly name="confidentiality-impact"
                 key="confidentiality-impact"
-                _using-name="confidentiality-impact"
-                _in-xml-name="confidentiality-impact"
-                _in-json-name="confidentiality-impact"
                 gi="confidentiality-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
@@ -3825,17 +2540,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3855,20 +2563,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/base" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3888,20 +2586,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/selected" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3921,21 +2609,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/confidentiality-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/confidentiality-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -3955,15 +2633,8 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact" -->
-      <assembly _step="integrity-impact"
-                _key="integrity-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact"
-                name="integrity-impact"
+      <assembly name="integrity-impact"
                 key="integrity-impact"
-                _using-name="integrity-impact"
-                _in-xml-name="integrity-impact"
-                _in-json-name="integrity-impact"
                 gi="integrity-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">integrity-impact</xsl:attribute>
@@ -3979,17 +2650,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4009,20 +2673,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/base" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4042,20 +2696,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/selected" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4075,21 +2719,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/integrity-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/integrity-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4109,15 +2743,8 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact" -->
-      <assembly _step="availability-impact"
-                _key="availability-impact"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact"
-                _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact"
-                name="availability-impact"
+      <assembly name="availability-impact"
                 key="availability-impact"
-                _using-name="availability-impact"
-                _in-xml-name="availability-impact"
-                _in-json-name="availability-impact"
                 gi="availability-impact">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">availability-impact</xsl:attribute>
@@ -4133,17 +2760,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4163,20 +2783,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/base" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/base"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/base"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="base"
              key="base"
-             _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"
-             _key-ref="oscal-ssp:base"
-             _using-name="base"
-             _in-xml-name="base"
-             _in-json-name="base"
              gi="base"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4196,20 +2806,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/selected" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/selected"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/selected"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="selected"
              key="selected"
-             _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"
-             _key-ref="oscal-ssp:selected"
-             _using-name="selected"
-             _in-xml-name="selected"
-             _in-json-name="selected"
              gi="selected"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4229,21 +2829,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/adjustment-justification" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-information/information-type/availability-impact/adjustment-justification"
-             _metaschema-json-id="/assembly/oscal-ssp/system-information/information-types/availability-impact/adjustment-justification"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _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"
-             _key-ref="oscal-ssp:adjustment-justification"
-             _using-name="adjustment-justification"
-             _in-xml-name="adjustment-justification"
-             _in-json-name="adjustment-justification"
              gi="adjustment-justification"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4263,17 +2853,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-confidentiality" -->
-      <field _step="security-objective-confidentiality"
-             _key="security-objective-confidentiality"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-confidentiality"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-confidentiality"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-confidentiality"
              key="security-objective-confidentiality"
-             _using-name="security-objective-confidentiality"
-             _in-xml-name="security-objective-confidentiality"
-             _in-json-name="security-objective-confidentiality"
              gi="security-objective-confidentiality"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4293,17 +2876,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-integrity" -->
-      <field _step="security-objective-integrity"
-             _key="security-objective-integrity"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-integrity"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-integrity"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-integrity"
              key="security-objective-integrity"
-             _using-name="security-objective-integrity"
-             _in-xml-name="security-objective-integrity"
-             _in-json-name="security-objective-integrity"
              gi="security-objective-integrity"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4323,17 +2899,10 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-availability" -->
-      <field _step="security-objective-availability"
-             _key="security-objective-availability"
-             _metaschema-xml-id="/assembly/oscal-ssp/security-impact-level/security-objective-availability"
-             _metaschema-json-id="/assembly/oscal-ssp/security-impact-level/security-objective-availability"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="security-objective-availability"
              key="security-objective-availability"
-             _using-name="security-objective-availability"
-             _in-xml-name="security-objective-availability"
-             _in-json-name="security-objective-availability"
              gi="security-objective-availability"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4353,19 +2922,7 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/status" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-characteristics/status"
-                _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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:status"
-                _step="status"
-                _key="status"
-                _key-ref="oscal-ssp:status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -4377,18 +2934,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/description"
-             _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4408,17 +2958,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4438,18 +2981,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4469,17 +3005,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4499,17 +3028,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/caption" -->
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4529,18 +3051,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/remarks" -->
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4560,18 +3075,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/remarks" -->
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4591,18 +3099,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/network-architecture/description"
-             _metaschema-json-id="/assembly/oscal-ssp/network-architecture/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4622,17 +3123,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4652,18 +3146,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4683,17 +3170,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4713,17 +3193,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/caption" -->
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4743,18 +3216,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/remarks" -->
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4774,18 +3240,11 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/data-flow/description"
-             _metaschema-json-id="/assembly/oscal-ssp/data-flow/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4805,17 +3264,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4835,18 +3287,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/description"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4866,17 +3311,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4896,17 +3334,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/caption" -->
-      <field _step="caption"
-             _key="caption"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/caption"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/caption"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="caption"
              key="caption"
-             _using-name="caption"
-             _in-xml-name="caption"
-             _in-json-name="caption"
              gi="caption"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4926,18 +3357,11 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/remarks" -->
-      <field _step="remarks"
-             _key="remarks"
-             _metaschema-xml-id="/assembly/oscal-ssp/diagram/remarks"
-             _metaschema-json-id="/assembly/oscal-ssp/diagram/remarks"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _using-name="remarks"
-             _in-xml-name="remarks"
-             _in-json-name="remarks"
              gi="remarks"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4957,17 +3381,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -4987,17 +3404,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5017,15 +3427,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization" -->
-      <assembly _step="leveraged-authorization"
-                _key="leveraged-authorizations"
-                _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization"
-                _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations"
-                name="leveraged-authorization"
-                _using-name="leveraged-authorization"
-                _in-xml-name="leveraged-authorization"
-                _in-json-name="leveraged-authorizations"
-                gi="leveraged-authorization">
+      <assembly name="leveraged-authorization" gi="leveraged-authorization">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -5039,17 +3441,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/title"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5069,17 +3464,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5099,17 +3487,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/party-uuid" -->
-      <field _step="party-uuid"
-             _key="party-uuid"
-             _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/party-uuid"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/party-uuid"
-             collapsible="no"
+      <field collapsible="no"
              as-type="uuid"
              name="party-uuid"
              key="party-uuid"
-             _using-name="party-uuid"
-             _in-xml-name="party-uuid"
-             _in-json-name="party-uuid"
              gi="party-uuid"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5129,20 +3510,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/date-authorized" -->
-      <field _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/leveraged-authorization/date-authorized"
-             _metaschema-json-id="/assembly/oscal-ssp/system-implementation/leveraged-authorizations/date-authorized"
-             collapsible="no"
+      <field collapsible="no"
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _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"
-             _key-ref="oscal-ssp:date-authorized"
-             _using-name="date-authorized"
-             _in-xml-name="date-authorized"
-             _in-json-name="date-authorized"
              gi="date-authorized"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5162,17 +3533,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5192,17 +3556,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/short-name" -->
-      <field _step="short-name"
-             _key="short-name"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/short-name"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/short-name"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="short-name"
              key="short-name"
-             _using-name="short-name"
-             _in-xml-name="short-name"
-             _in-json-name="short-name"
              gi="short-name"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5222,18 +3579,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-user/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5253,17 +3603,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5283,17 +3626,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/authorized-privilege/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5313,18 +3649,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/authorized-privilege/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/authorized-privilege/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5344,17 +3673,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5374,18 +3696,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5405,17 +3720,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/purpose" -->
-      <field _step="purpose"
-             _key="purpose"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/purpose"
-             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/purpose"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="purpose"
              key="purpose"
-             _using-name="purpose"
-             _in-xml-name="purpose"
-             _in-json-name="purpose"
              gi="purpose"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5435,17 +3743,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5465,16 +3766,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/status" -->
-      <assembly _step="status"
-                _key="status"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/status"
-                _metaschema-json-id="/assembly/oscal-implementation-common/system-component/status"
-                name="status"
-                key="status"
-                _using-name="status"
-                _in-xml-name="status"
-                _in-json-name="status"
-                gi="status">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -5486,17 +3778,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5516,17 +3801,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/protocol/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/title"
-             _metaschema-json-id="/assembly/oscal-implementation-common/protocol/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5546,18 +3824,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/description"
-             _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5577,17 +3848,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5607,17 +3871,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5637,15 +3894,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component" -->
-      <assembly _step="implemented-component"
-                _key="implemented-components"
-                _metaschema-xml-id="/assembly/oscal-implementation-common/inventory-item/implemented-component"
-                _metaschema-json-id="/assembly/oscal-implementation-common/inventory-item/implemented-components"
-                name="implemented-component"
-                _using-name="implemented-component"
-                _in-xml-name="implemented-component"
-                _in-json-name="implemented-components"
-                gi="implemented-component">
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -5657,17 +3906,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5687,17 +3929,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/responsible-party/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5717,18 +3952,8 @@
                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation" -->
-      <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
-                _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
-                name="control-implementation"
+      <assembly name="control-implementation"
                 key="control-implementation"
-                _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"
-                _key-ref="oscal-ssp:control-implementation"
-                _using-name="control-implementation"
-                _in-xml-name="control-implementation"
-                _in-json-name="control-implementation"
                 gi="control-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">control-implementation</xsl:attribute>
@@ -5742,18 +3967,11 @@
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/control-implementation/description"
-             _metaschema-json-id="/assembly/oscal-ssp/control-implementation/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5773,16 +3991,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -5799,18 +4010,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement" -->
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:implemented-requirement"
-                _step="implemented-requirement"
-                _key="implemented-requirements"
-                _key-ref="oscal-ssp:implemented-requirement"
-                _using-name="implemented-requirement"
-                _in-xml-name="implemented-requirement"
-                _in-json-name="implemented-requirements"
-                gi="implemented-requirement">
+      <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='control-id']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -5826,17 +4026,10 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5856,16 +4049,9 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -5882,17 +4068,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5912,18 +4091,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement" -->
-      <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/src/metaschema/oscal_ssp_metaschema.xml"
-                _key-name="oscal-ssp:statement"
-                _step="statement"
-                _key="statements"
-                _key-ref="oscal-ssp:statement"
-                _using-name="statement"
-                _in-xml-name="statement"
-                _in-json-name="statements"
-                gi="statement">
+      <assembly name="statement" gi="statement">
          <xsl:apply-templates select="*[@key='statement-id']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -5937,17 +4105,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5967,17 +4128,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -5997,18 +4151,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6028,17 +4175,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6058,16 +4198,9 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6084,16 +4217,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export" -->
-      <assembly _step="export"
-                _key="export"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export"
-                name="export"
-                key="export"
-                _using-name="export"
-                _in-xml-name="export"
-                _in-json-name="export"
-                gi="export">
+      <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">export</xsl:attribute>
          </xsl:if>
@@ -6109,18 +4233,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6140,17 +4257,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6170,15 +4280,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided" -->
-      <assembly _step="provided"
-                _key="provided"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided"
-                name="provided"
-                _using-name="provided"
-                _in-xml-name="provided"
-                _in-json-name="provided"
-                gi="provided">
+      <assembly name="provided" gi="provided">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -6191,18 +4293,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6222,17 +4317,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6252,17 +4340,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6282,15 +4363,7 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility" -->
-      <assembly _step="responsibility"
-                _key="responsibilities"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities"
-                name="responsibility"
-                _using-name="responsibility"
-                _in-xml-name="responsibility"
-                _in-json-name="responsibilities"
-                gi="responsibility">
+      <assembly name="responsibility" gi="responsibility">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='provided-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -6304,18 +4377,11 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6335,17 +4401,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6365,17 +4424,10 @@
                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6395,15 +4447,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited" -->
-      <assembly _step="inherited"
-                _key="inherited"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited"
-                name="inherited"
-                _using-name="inherited"
-                _in-xml-name="inherited"
-                _in-json-name="inherited"
-                gi="inherited">
+      <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='provided-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -6416,18 +4460,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6447,17 +4484,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6477,17 +4507,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6507,15 +4530,7 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied" -->
-      <assembly _step="satisfied"
-                _key="satisfied"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied"
-                name="satisfied"
-                _using-name="satisfied"
-                _in-xml-name="satisfied"
-                _in-json-name="satisfied"
-                gi="satisfied">
+      <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='responsibility-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -6529,18 +4544,11 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6560,17 +4568,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6590,17 +4591,10 @@
                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6620,17 +4614,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6650,18 +4637,11 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6681,17 +4661,10 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6711,16 +4684,9 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/set-parameter/value" -->
-      <field _step="value"
-             _key="values"
-             _metaschema-xml-id="/assembly/oscal-implementation-common/set-parameter/value"
-             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/values"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="parameter-value"
-             _using-name="value"
-             _in-xml-name="value"
-             _in-json-name="values"
              gi="value"
              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -6737,16 +4703,7 @@
                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export" -->
-      <assembly _step="export"
-                _key="export"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export"
-                name="export"
-                key="export"
-                _using-name="export"
-                _in-xml-name="export"
-                _in-json-name="export"
-                gi="export">
+      <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">export</xsl:attribute>
          </xsl:if>
@@ -6762,18 +4719,11 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6793,17 +4743,10 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6823,15 +4766,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided" -->
-      <assembly _step="provided"
-                _key="provided"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided"
-                name="provided"
-                _using-name="provided"
-                _in-xml-name="provided"
-                _in-json-name="provided"
-                gi="provided">
+      <assembly name="provided" gi="provided">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
@@ -6844,18 +4779,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/provided/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6875,17 +4803,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6905,17 +4826,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6935,15 +4849,7 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility" -->
-      <assembly _step="responsibility"
-                _key="responsibilities"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities"
-                name="responsibility"
-                _using-name="responsibility"
-                _in-xml-name="responsibility"
-                _in-json-name="responsibilities"
-                gi="responsibility">
+      <assembly name="responsibility" gi="responsibility">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='provided-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -6957,18 +4863,11 @@
                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/export/responsibility/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -6988,17 +4887,10 @@
                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7018,17 +4910,10 @@
                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7048,15 +4933,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited" -->
-      <assembly _step="inherited"
-                _key="inherited"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited"
-                name="inherited"
-                _using-name="inherited"
-                _in-xml-name="inherited"
-                _in-json-name="inherited"
-                gi="inherited">
+      <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='provided-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -7069,18 +4946,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/inherited/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7100,17 +4970,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7130,17 +4993,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7160,15 +5016,7 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied" -->
-      <assembly _step="satisfied"
-                _key="satisfied"
-                _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied"
-                _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied"
-                name="satisfied"
-                _using-name="satisfied"
-                _in-xml-name="satisfied"
-                _in-json-name="satisfied"
-                gi="satisfied">
+      <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='responsibility-uuid']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -7182,18 +5030,11 @@
                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7213,17 +5054,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7243,17 +5077,10 @@
                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7273,17 +5100,10 @@
                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/responsible-role/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7303,15 +5123,7 @@
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource" -->
-      <assembly _step="resource"
-                _key="resources"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources"
-                name="resource"
-                _using-name="resource"
-                _in-xml-name="resource"
-                _in-json-name="resources"
-                gi="resource">
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
@@ -7327,17 +5139,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/title" -->
-      <field _step="title"
-             _key="title"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/title"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/title"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="title"
              key="title"
-             _using-name="title"
-             _in-xml-name="title"
-             _in-json-name="title"
              gi="title"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7357,18 +5162,11 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/description" -->
-      <field _step="description"
-             _key="description"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/description"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/description"
-             in-xml="WITH_WRAPPER"
+      <field in-xml="WITH_WRAPPER"
              collapsible="no"
              as-type="markup-multiline"
              name="description"
              key="description"
-             _using-name="description"
-             _in-xml-name="description"
-             _in-json-name="description"
              gi="description"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7388,19 +5186,9 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/document-id" -->
-      <field _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/document-id"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/document-ids"
-             collapsible="no"
+      <field collapsible="no"
              as-type="string"
              name="document-id"
-             _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"
-             _key-ref="oscal-metadata:document-id"
-             _using-name="document-id"
-             _in-xml-name="document-id"
-             _in-json-name="document-ids"
              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
@@ -7417,16 +5205,7 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/citation" -->
-      <assembly _step="citation"
-                _key="citation"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation"
-                name="citation"
-                key="citation"
-                _using-name="citation"
-                _in-xml-name="citation"
-                _in-json-name="citation"
-                gi="citation">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
@@ -7439,17 +5218,10 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/citation/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/citation/text"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/citation/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7469,17 +5241,10 @@
                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/citation/link/text" -->
-      <field _step="text"
-             _key="text"
-             _metaschema-xml-id="/assembly/oscal-metadata/link/text"
-             _metaschema-json-id="/assembly/oscal-metadata/link/text"
-             collapsible="no"
+      <field collapsible="no"
              as-type="markup-line"
              name="text"
              key="text"
-             _using-name="text"
-             _in-xml-name="text"
-             _in-json-name="text"
              gi="text"
              in-json="SCALAR">
          <xsl:if test="$with-key">
@@ -7499,15 +5264,7 @@
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/rlink" -->
-      <assembly _step="rlink"
-                _key="rlinks"
-                _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/rlink"
-                _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks"
-                name="rlink"
-                _using-name="rlink"
-                _in-xml-name="rlink"
-                _in-json-name="rlinks"
-                gi="rlink">
+      <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="*[@key='hashes']"/>
@@ -7517,17 +5274,10 @@
                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/base64" -->
-      <field _step="base64"
-             _key="base64"
-             _metaschema-xml-id="/assembly/oscal-metadata/back-matter/resource/base64"
-             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64"
-             collapsible="no"
+      <field collapsible="no"
              as-type="base64Binary"
              name="base64"
              key="base64"
-             _using-name="base64"
-             _in-xml-name="base64"
-             _in-json-name="base64"
              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
@@ -7581,11 +5331,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"/>