diff --git a/dist/content/resources/json/FedRAMP_extensions.json b/dist/content/resources/json/FedRAMP_extensions.json
index f99f6f53e..c44c74b05 100644
--- a/dist/content/resources/json/FedRAMP_extensions.json
+++ b/dist/content/resources/json/FedRAMP_extensions.json
@@ -5,9 +5,9 @@
         "uuid": "BA710064-79AC-47D5-8F70-6749B359E7E2",
         "metadata": {
             "title": "[EXPERIMENTAL] FedRAMP Extensions",
-            "published": "2021-08-12T12:38:01Z",
-            "last-modified": "2021-08-12T12:38:01Z",
-            "version": "fedramp1.1.0-oscal1.0.0",
+            "published": "2021-10-22T05:55:26Z",
+            "last-modified": "2021-10-22T05:55:26Z",
+            "version": "fedramp1.2.1-oscal1.0.0",
             "oscal-version": "oscal-1.0.0",
             "revisions": {
                 "revision": [
@@ -60,6 +60,16 @@
                             "#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
                         },
                         "remarks": {"p": "Updated version reviewed for fedramp1.1.0-oscal1.0.0 release."}
+                    },
+                    {
+                        "published": "2021-10-22T05:55:26Z",
+                        "version": "fedramp1.2.1-oscal1.0.0",
+                        "prop": {
+                            "name": "party-uuid",
+                            "ns": "https://fedramp.gov/ns/oscal",
+                            "#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
+                        },
+                        "remarks": {"p": "Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release."}
                     }
                 ]
             },
@@ -732,46 +742,6 @@
                     }
                 }
             },
-            {
-                "id": "port",
-                "extension-name": "port",
-                "formal-name": "Interconnection Port",
-                "description": "A port used by the interconnection for the communication.",
-                "binding": {"pattern": "/o:system-security-plan/o:system-implementation/o:component[@type='interconnection']/o:prop"},
-                "constraint": {
-                    "matches": {"data-type": "string"},
-                    "has-cardinality": {
-                        "min-occurs": 1,
-                        "max-occurs": "unbounded"
-                    },
-                    "expect": {"test": ".[@class]"}
-                }
-            },
-            {
-                "id": "transport-type",
-                "extension-name": "transport-type",
-                "formal-name": "Transport Type",
-                "description": "The internet protocol transport type.",
-                "binding": {"pattern": "o:component[@component-type='service']/o:protocol/o:port-range/@transport"},
-                "constraint": {
-                    "matches": {"data-type": "token"},
-                    "allowed-values": {
-                        "allow-other": "no",
-                        "enum": [
-                            {
-                                "value": "tcp",
-                                "short-label": "TCP",
-                                "#text": "TCP"
-                            },
-                            {
-                                "value": "udp",
-                                "short-label": "UDP",
-                                "#text": "UDP"
-                            }
-                        ]
-                    }
-                }
-            },
             {
                 "id": "inventory-item-state",
                 "extension-name": "inventory-item-state",
@@ -1111,7 +1081,7 @@
                 "extension-name": "control-objective-implementation-status",
                 "formal-name": "Objective Implementation Status",
                 "description": "Indicates the implementation status of the control objective.",
-                "binding": {"pattern": "/o:assessment-results/o:results/o:finding/o:objective-status/o:prop"},
+                "binding": {"pattern": "/o:assessment-results/o:results/o:finding/o:target/o:prop"},
                 "constraint": {
                     "matches": {"data-type": "token"},
                     "has-cardinality": {
@@ -1175,7 +1145,7 @@
                 "extension-name": "leveraged-authorization-uuid",
                 "formal-name": "Leveraged Authorization",
                 "description": "Indicates a leveraged authorization used for this control.",
-                "binding": {"pattern": "/o:assessment-results/o:results/o:finding/o:objective-status/o:prop"},
+                "binding": {"pattern": "/o:assessment-results/o:results/o:finding/o:target/o:prop"},
                 "constraint": {
                     "matches": {"data-type": "uuid"},
                     "has-cardinality": {
@@ -2200,6 +2170,11 @@
                             "short-label": "Agreement",
                             "#text": "Agreement"
                         },
+                        {
+                            "value": "isa-agreement",
+                            "short-label": "Agreement",
+                            "#text": "Interconnection Security Agreement"
+                        },
                         {
                             "value": "incident-response-plan",
                             "short-label": "IRP",
@@ -2420,10 +2395,10 @@
                 }
             },
             {
-                "name": "system-operational-status",
+                "name": "operational-status",
                 "formal-name": "Operational Status (system)",
                 "description": "The operational status of the system",
-                "binding": {"pattern": "/o:system-security-plan/o:system-characteristics/o:status/@state"},
+                "binding": {"pattern": "o:status/@state"},
                 "allowed-values": {
                     "allow-other": "no",
                     "enum": [
@@ -2437,6 +2412,11 @@
                             "short-label": "Development",
                             "#text": "Under Development"
                         },
+                        {
+                            "value": "under-major-modification",
+                            "short-label": "Major Mod.",
+                            "#text": "Major Modification"
+                        },
                         {
                             "value": "disposition",
                             "short-label": "Alternative",
diff --git a/dist/content/resources/json/fedramp_threats.json b/dist/content/resources/json/fedramp_threats.json
index 71d35e4c2..b16195245 100644
--- a/dist/content/resources/json/fedramp_threats.json
+++ b/dist/content/resources/json/fedramp_threats.json
@@ -4,9 +4,9 @@
         "uuid": "7539047F-158B-4AA0-8FC5-F0530F1CC5CF",
         "metadata": {
             "title": "FedRAMP Defined Threat Table [Experimental]",
-            "published": "2021-08-12T12:38:01Z",
-            "last-modified": "2021-08-12T12:38:01Z",
-            "version": "fedramp1.1.0-oscal1.0.0",
+            "published": "2021-10-22T05:55:26Z",
+            "last-modified": "2021-10-22T05:55:26Z",
+            "version": "fedramp1.2.1-oscal1.0.0",
             "revisions": {
                 "revision": [
                     {
@@ -48,6 +48,16 @@
                             "#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
                         },
                         "remarks": {"p": "Updated version reviewed for fedramp1.1.0-oscal1.0.0 releasess."}
+                    },
+                    {
+                        "published": "2021-10-22T05:55:26Z",
+                        "version": "fedramp1.2.1-oscal1.0.0",
+                        "prop": {
+                            "name": "party-uuid",
+                            "ns": "https://fedramp.gov/ns/oscal",
+                            "#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
+                        },
+                        "remarks": {"p": "Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release."}
                     }
                 ]
             },
diff --git a/dist/content/resources/json/fedramp_values.json b/dist/content/resources/json/fedramp_values.json
index 6cdeae2b1..bf6e0de2e 100644
--- a/dist/content/resources/json/fedramp_values.json
+++ b/dist/content/resources/json/fedramp_values.json
@@ -4,9 +4,9 @@
         "metadata": {
             "title": "[EXPERIMENTAL] FedRAMP Defined Identifiers and Accepted Values",
             "title-short": "FedRAMP Data Values (Experimental)",
-            "published": "2021-08-12T12:38:01Z",
-            "last-modified": "2021-08-12T12:38:01Z",
-            "version": "fedramp1.1.0-oscal1.0.0",
+            "published": "2021-10-22T05:55:26Z",
+            "last-modified": "2021-10-22T05:55:26Z",
+            "version": "fedramp1.2.1-oscal1.0.0",
             "author": "FedRAMP PMO",
             "description": "This EXPERIMENTAL file provides the FedRAMP defined identifiers and acceptable values in a machine-readable format.",
             "remarks": ""
@@ -463,10 +463,10 @@
                 "remarks": "FedRAMP only allows information types defined in NIST SP 800-60v2r1."
             },
             {
-                "name": "system-operational-status",
+                "name": "operational-status",
                 "formal-name": "Operational Status (system)",
                 "description": "The operational status of the system",
-                "binding": {"pattern": "system-characteristics/status/@state"},
+                "binding": {"pattern": "status/@state"},
                 "allowed-values": {
                     "allow-other": "no",
                     "enum": [
@@ -498,37 +498,6 @@
                     ]
                 }
             },
-            {
-                "name": "component-operational-status",
-                "formal-name": "Operational Status (component)",
-                "description": "The operational status of the component",
-                "binding": {"pattern": "component/status/@state"},
-                "allowed-values": {
-                    "allow-other": "no",
-                    "enum": [
-                        {
-                            "value": "operational",
-                            "short-label": "Operational",
-                            "#text": "Operational"
-                        },
-                        {
-                            "value": "under-development",
-                            "short-label": "Development",
-                            "#text": "Under Development"
-                        },
-                        {
-                            "value": "disposition",
-                            "short-label": "Alternative",
-                            "#text": "Alternative Implementation"
-                        },
-                        {
-                            "value": "other",
-                            "short-label": "Other",
-                            "#text": "Other"
-                        }
-                    ]
-                }
-            },
             {
                 "name": "user-type",
                 "formal-name": "User Type",
@@ -621,7 +590,7 @@
                 "name": "interconnection-direction",
                 "formal-name": "Interconnection Direction",
                 "description": "Identifies the direction of information flow for the interconnection.",
-                "binding": {"pattern": "component[@component-type='interconnection']/prop[@name='direction'][@ns='https://fedramp.gov/ns/oscal']"},
+                "binding": {"pattern": "component[@component-type='interconnection']/prop[@name='interconnection-direction'][@ns='https://fedramp.gov/ns/oscal']"},
                 "allowed-values": {
                     "allow-other": "no",
                     "enum": [
@@ -647,7 +616,7 @@
                 "name": "interconnection-security",
                 "formal-name": "Interconnection Security",
                 "description": "Identifies the type of security applied to the interconnection.",
-                "binding": {"pattern": "component[@component-type='interconnection']/prop[@name='connection-security'][@ns='https://fedramp.gov/ns/oscal']/@value"},
+                "binding": {"pattern": "component[@component-type='interconnection']/prop[@name='interconnection-security'][@ns='https://fedramp.gov/ns/oscal']/@value"},
                 "allowed-values": {
                     "allow-other": "no",
                     "enum": [
@@ -662,14 +631,19 @@
                             "#text": "Virtual Private Network"
                         },
                         {
-                            "value": "ssl",
-                            "short-label": "SSL",
-                            "#text": "Secure Socket Layer"
+                            "value": "tls",
+                            "short-label": "TLS",
+                            "#text": "Transport-Layer Security"
+                        },
+                        {
+                            "value": "dtls",
+                            "short-label": "TLS",
+                            "#text": "Transport-Layer Security"
                         },
                         {
                             "value": "certificate",
                             "short-label": "Cert",
-                            "#text": "Certificate"
+                            "#text": "Certificate Authentication Security"
                         },
                         {
                             "value": "secure-file-transfer",
@@ -1187,6 +1161,11 @@
                             "short-label": "Agreement",
                             "#text": "Agreement"
                         },
+                        {
+                            "value": "isa-agreement",
+                            "short-label": "Agreement",
+                            "#text": "Interconnection Security Agreement"
+                        },
                         {
                             "value": "incident-response-plan",
                             "short-label": "IRP",
diff --git a/dist/content/resources/json/information-types.json b/dist/content/resources/json/information-types.json
index 72e721fd3..d04d386b9 100644
--- a/dist/content/resources/json/information-types.json
+++ b/dist/content/resources/json/information-types.json
@@ -4,9 +4,9 @@
         "uuid": "157BB1F7-8BE7-4642-9D5B-60B5995684F0",
         "metadata": {
             "title": "FedRAMP Acceptable Information Types (Experimental)",
-            "published": "2021-08-12T12:38:01Z",
-            "last-modified": "2021-08-12T12:38:01Z",
-            "version": "fedramp1.1.0-oscal1.0.0",
+            "published": "2021-10-22T05:55:26Z",
+            "last-modified": "2021-10-22T05:55:26Z",
+            "version": "fedramp1.2.1-oscal1.0.0",
             "revisions": {
                 "revision": [
                     {
@@ -48,6 +48,16 @@
                             "#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
                         },
                         "remarks": {"p": "Updated version reviewed for fedramp1.1.0-oscal1.0.0 release."}
+                    },
+                    {
+                        "published": "2021-10-22T05:55:26Z",
+                        "version": "fedramp1.2.1-oscal1.0.0",
+                        "prop": {
+                            "name": "party-uuid",
+                            "ns": "https://fedramp.gov/ns/oscal",
+                            "#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
+                        },
+                        "remarks": {"p": "Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release."}
                     }
                 ]
             },
diff --git a/dist/content/resources/xml/FedRAMP_extensions.xml b/dist/content/resources/xml/FedRAMP_extensions.xml
index 9286f356a..f5c6fc941 100644
--- a/dist/content/resources/xml/FedRAMP_extensions.xml
+++ b/dist/content/resources/xml/FedRAMP_extensions.xml
@@ -3,9 +3,9 @@
    xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="BA710064-79AC-47D5-8F70-6749B359E7E2" >
    <metadata>
       <title>[EXPERIMENTAL] FedRAMP Extensions</title>
-      <published>2021-08-12T12:38:01Z</published>
-      <last-modified>2021-08-12T12:38:01Z</last-modified>
-      <version>fedramp1.1.0-oscal1.0.0</version>
+      <published>2021-10-22T05:55:26Z</published>
+      <last-modified>2021-10-22T05:55:26Z</last-modified>
+      <version>fedramp1.2.1-oscal1.0.0</version>
       <oscal-version>oscal-1.0.0</oscal-version>
       <revisions>
          <revision>
@@ -48,6 +48,14 @@
                 <p>Updated version reviewed for fedramp1.1.0-oscal1.0.0 release.</p>
             </remarks>
         </revision>
+        <revision>
+           <published>2021-10-22T05:55:26Z</published>
+           <version>fedramp1.2.1-oscal1.0.0</version>
+           <prop name="party-uuid" ns="https://fedramp.gov/ns/oscal">6b286b5d-8f07-4fa7-8847-1dd0d88f73fb</prop>
+           <remarks>
+              <p>Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release.</p>
+            </remarks>
+        </revision>
       </revisions>
       
       <role id="prepared-by">
@@ -449,32 +457,6 @@
       </constraint>
    </extension>
 
-   <extension id="port" >
-      <extension-name>port</extension-name>
-      <formal-name>Interconnection Port</formal-name>
-      <description>A port used by the interconnection for the communication.</description>
-      <binding pattern="/o:system-security-plan/o:system-implementation/o:component[@type='interconnection']/o:prop" />
-      <constraint>
-         <matches data-type="string" />
-         <has-cardinality min-occurs="1" max-occurs="unbounded" />
-         <expect test=".[@class]" />
-      </constraint>
-   </extension>
-
-   <extension id="transport-type">
-      <extension-name>transport-type</extension-name>
-      <formal-name>Transport Type</formal-name>
-      <description>The internet protocol transport type.</description>
-      <binding pattern="o:component[@component-type='service']/o:protocol/o:port-range/@transport" />
-      <constraint>
-         <matches data-type="token" />
-         <allowed-values allow-other="no">
-            <enum value="tcp" short-label="TCP">TCP</enum>
-            <enum value="udp" short-label="UDP">UDP</enum>
-         </allowed-values>
-      </constraint>
-   </extension>
-
    <extension id="inventory-item-state">
       <extension-name>inventory-item-state</extension-name>
       <formal-name>Different states of inventory items: public, private, et cetera.</formal-name>
@@ -701,7 +683,7 @@
       <extension-name>control-objective-implementation-status</extension-name>
       <formal-name>Objective Implementation Status</formal-name>
       <description>Indicates the implementation status of the control objective.</description>
-      <binding pattern="/o:assessment-results/o:results/o:finding/o:objective-status/o:prop"/>
+      <binding pattern="/o:assessment-results/o:results/o:finding/o:target/o:prop"/>
       <constraint>
          <matches data-type="token" />
          <has-cardinality min-occurs="0" max-occurs="1" />
@@ -732,7 +714,7 @@
       <extension-name>leveraged-authorization-uuid</extension-name>
       <formal-name>Leveraged Authorization</formal-name>
       <description>Indicates a leveraged authorization used for this control.</description>
-      <binding pattern="/o:assessment-results/o:results/o:finding/o:objective-status/o:prop"/>
+      <binding pattern="/o:assessment-results/o:results/o:finding/o:target/o:prop"/>
       <constraint>
          <matches data-type="uuid" />
          <has-cardinality min-occurs="0" max-occurs="unbounded" />
@@ -1251,6 +1233,7 @@
          <!-- All the privacy "types" need rationalization -->
          <enum value="personal-identifiable-information" short-label="PII">Personal Identifiable Information (PII)</enum>
          <enum value="agreement" short-label="Agreement">Agreement</enum>
+         <enum value="isa-agreement" short-label="Agreement">Interconnection Security Agreement</enum>
          <enum value="incident-response-plan" short-label="IRP">Incident Response Plan</enum>
          <enum value="information-security-policies-and-procedures" short-label="ISPP">Incident Security Policies and Procedures</enum>
          <enum value="user-guide" short-label="User Guide">User Guide</enum>
@@ -1359,13 +1342,14 @@
       </allowed-values>
    </constraint>
    
-   <constraint name="system-operational-status">
+   <constraint name="operational-status">
       <formal-name>Operational Status (system)</formal-name>
       <description>The operational status of the system</description>
-      <binding pattern="/o:system-security-plan/o:system-characteristics/o:status/@state"/>
+      <binding pattern="o:status/@state"/>
       <allowed-values allow-other="no">
          <enum value="operational" short-label="Operational">Operational</enum>
          <enum value="under-development" short-label="Development">Under Development</enum>
+         <enum value="under-major-modification" short-label="Major Mod.">Major Modification</enum>
          <enum value="disposition" short-label="Alternative">Alternative Implementation</enum>
          <enum value="other" short-label="Other">Other</enum>
       </allowed-values>
diff --git a/dist/content/resources/xml/fedramp_threats.xml b/dist/content/resources/xml/fedramp_threats.xml
index 7f8cb66e1..016c84c2e 100644
--- a/dist/content/resources/xml/fedramp_threats.xml
+++ b/dist/content/resources/xml/fedramp_threats.xml
@@ -3,9 +3,9 @@
 
     <metadata>
         <title>FedRAMP Defined Threat Table [Experimental]</title>
-        <published>2021-08-12T12:38:01Z</published>
-        <last-modified>2021-08-12T12:38:01Z</last-modified>
-        <version>fedramp1.1.0-oscal1.0.0</version>
+        <published>2021-10-22T05:55:26Z</published>
+        <last-modified>2021-10-22T05:55:26Z</last-modified>
+        <version>fedramp1.2.1-oscal1.0.0</version>
         <revisions>
             <revision>
                 <published>2019-06-01T00:00:00.00-04:00</published>
@@ -39,6 +39,14 @@
                     <p>Updated version reviewed for fedramp1.1.0-oscal1.0.0 releasess.</p>
                 </remarks>
             </revision>
+            <revision>
+                <published>2021-10-22T05:55:26Z</published>
+                <version>fedramp1.2.1-oscal1.0.0</version>
+                <prop name="party-uuid" ns="https://fedramp.gov/ns/oscal">6b286b5d-8f07-4fa7-8847-1dd0d88f73fb</prop>
+                <remarks>
+                    <p>Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release.</p>
+                </remarks>
+            </revision>
         </revisions>
         
         <role id="prepared-by">
diff --git a/dist/content/resources/xml/fedramp_values.xml b/dist/content/resources/xml/fedramp_values.xml
index 54417a2bc..49de533ae 100644
--- a/dist/content/resources/xml/fedramp_values.xml
+++ b/dist/content/resources/xml/fedramp_values.xml
@@ -3,9 +3,9 @@
    <metadata>
       <title>[EXPERIMENTAL] FedRAMP Defined Identifiers and Accepted Values</title>
       <title-short>FedRAMP Data Values (Experimental)</title-short>
-      <published>2021-08-12T12:38:01Z</published>
-      <last-modified>2021-08-12T12:38:01Z</last-modified>
-      <version>fedramp1.1.0-oscal1.0.0</version>
+      <published>2021-10-22T05:55:26Z</published>
+      <last-modified>2021-10-22T05:55:26Z</last-modified>
+      <version>fedramp1.2.1-oscal1.0.0</version>
       <author>FedRAMP PMO</author>
       <description>This EXPERIMENTAL file provides the FedRAMP defined identifiers and acceptable values in a machine-readable format.</description>
       <remarks />
@@ -214,10 +214,10 @@
       <remarks>FedRAMP only allows information types defined in NIST SP 800-60v2r1.</remarks>
    </value-set>
 
-   <value-set name="system-operational-status">
+   <value-set name="operational-status">
       <formal-name>Operational Status (system)</formal-name>
       <description>The operational status of the system</description>
-      <binding pattern="system-characteristics/status/@state" />
+      <binding pattern="status/@state" />
       <allowed-values allow-other="no">
          <enum value="operational" short-label="Operational">Operational</enum>
          <enum value="under-development" short-label="Development">Under Development</enum>
@@ -227,18 +227,6 @@
       </allowed-values>
    </value-set>
 
-   <value-set name="component-operational-status">
-      <formal-name>Operational Status (component)</formal-name>
-      <description>The operational status of the component</description>
-      <binding pattern="component/status/@state" />
-      <allowed-values allow-other="no">
-         <enum value="operational" short-label="Operational">Operational</enum>
-         <enum value="under-development" short-label="Development">Under Development</enum>
-         <enum value="disposition" short-label="Alternative">Alternative Implementation</enum>
-         <enum value="other" short-label="Other">Other</enum>
-      </allowed-values>
-   </value-set>
-
    <value-set name="user-type">
       <formal-name>User Type</formal-name>
       <description>Identifies the user type.</description>
@@ -277,7 +265,7 @@
    <value-set name="interconnection-direction">
       <formal-name>Interconnection Direction</formal-name>
       <description>Identifies the direction of information flow for the interconnection.</description>
-      <binding pattern="component[@component-type='interconnection']/prop[@name='direction'][@ns='https://fedramp.gov/ns/oscal']" />
+      <binding pattern="component[@component-type='interconnection']/prop[@name='interconnection-direction'][@ns='https://fedramp.gov/ns/oscal']" />
       <allowed-values allow-other="no">
          <enum value="incoming" short-label="In">Incoming</enum>
          <enum value="outgoing" short-label="Out">Outgoing</enum>
@@ -288,12 +276,13 @@
    <value-set name="interconnection-security">
       <formal-name>Interconnection Security</formal-name>
       <description>Identifies the type of security applied to the interconnection.</description>
-      <binding pattern="component[@component-type='interconnection']/prop[@name='connection-security'][@ns='https://fedramp.gov/ns/oscal']/@value" />
+      <binding pattern="component[@component-type='interconnection']/prop[@name='interconnection-security'][@ns='https://fedramp.gov/ns/oscal']/@value" />
       <allowed-values allow-other="no">
          <enum value="ipsec" short-label="IPsec">IPsec</enum>
          <enum value="vpn" short-label="VPN">Virtual Private Network</enum>
-         <enum value="ssl" short-label="SSL">Secure Socket Layer</enum>
-         <enum value="certificate" short-label="Cert">Certificate</enum>
+         <enum value="tls" short-label="TLS">Transport-Layer Security</enum>
+         <enum value="dtls" short-label="TLS">Transport-Layer Security</enum>
+         <enum value="certificate" short-label="Cert">Certificate Authentication Security</enum>
          <enum value="secure-file-transfer" short-label="SFT">Secure File Transfer</enum>
          <enum value="other" short-label="Other">Other</enum>
       </allowed-values>
@@ -467,6 +456,7 @@
          <!-- All the privacy "types" need rationalization -->
          <enum value="personally-identifiable-information" short-label="PII">Personal Identifiable Information (PII)</enum>
          <enum value="agreement" short-label="Agreement">Agreement</enum>
+         <enum value="isa-agreement" short-label="Agreement">Interconnection Security Agreement</enum>
          <enum value="incident-response-plan" short-label="IRP">Incident Response Plan</enum>
          <enum value="information-security-policies-and-procedures" short-label="ISPP">Incident Security Policies and Procedures</enum>
          <enum value="user-guide" short-label="User Guide">User Guide</enum>
diff --git a/dist/content/resources/xml/information-types.xml b/dist/content/resources/xml/information-types.xml
index fc0963ed0..426f70709 100644
--- a/dist/content/resources/xml/information-types.xml
+++ b/dist/content/resources/xml/information-types.xml
@@ -2,9 +2,9 @@
 <information-types xmlns="https://fedramp.gov/ns/oscal" uuid="157BB1F7-8BE7-4642-9D5B-60B5995684F0">
     <metadata>
         <title>FedRAMP Acceptable Information Types (Experimental)</title>
-        <published>2021-08-12T12:38:01Z</published>
-        <last-modified>2021-08-12T12:38:01Z</last-modified>
-        <version>fedramp1.1.0-oscal1.0.0</version>
+        <published>2021-10-22T05:55:26Z</published>
+        <last-modified>2021-10-22T05:55:26Z</last-modified>
+        <version>fedramp1.2.1-oscal1.0.0</version>
         <revisions>
             <revision>
                 <published>2019-06-01T00:00:00.00-04:00</published>
@@ -38,6 +38,14 @@
                     <p>Updated version reviewed for fedramp1.1.0-oscal1.0.0 release.</p>
                 </remarks>
             </revision>
+            <revision>
+                <published>2021-10-22T05:55:26Z</published>
+                <version>fedramp1.2.1-oscal1.0.0</version>
+                <prop name="party-uuid" ns="https://fedramp.gov/ns/oscal">6b286b5d-8f07-4fa7-8847-1dd0d88f73fb</prop>
+                <remarks>
+                    <p>Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release.</p>
+                </remarks>
+            </revision>
         </revisions>
 
         <link rel="canonical"
diff --git a/documents/FedRAMP_Extensions.pdf b/documents/FedRAMP_Extensions.pdf
index 87b8b0bdc..5ca041d29 100644
Binary files a/documents/FedRAMP_Extensions.pdf and b/documents/FedRAMP_Extensions.pdf differ
diff --git a/documents/FedRAMP_extensions.html b/documents/FedRAMP_extensions.html
index 0485c51f2..8a5e28619 100644
--- a/documents/FedRAMP_extensions.html
+++ b/documents/FedRAMP_extensions.html
@@ -526,30 +526,6 @@ <h4 class="formal-name">Transmitted Information</h4>
             <td class="avs center"> </td>
             <td class="notes"></td>
          </tr>
-         <tr class="extension">
-            <td class="center"><span class="grey">n/a</span></td>
-            <td class="center"><span class="cardinality">1 to ∞</span></td>
-            <td class="center"><span class="grey">n/a</span></td>
-            <td class="center"><span class="grey">n/a</span></td>
-            <td class="center"><span class="grey">n/a</span></td>
-            <td class="data">
-               <h4 class="formal-name">Interconnection Port</h4>
-               <p class="description">A port used by the interconnection for the communication.</p>
-            </td>
-            <td class="mtype">
-               <p class="pattern">prop</p>
-            </td>
-            <td class="pname">
-               <p class="extension-name">port</p>
-            </td>
-            <td class="xpaths">
-               <p class="binding">/o:system-security-plan/o:system-implementation/o:component[@type='interconnection']/o:prop</p>
-            </td>
-            <td class="mdtype">string</td>
-            <td class="defined-ids center"> </td>
-            <td class="avs center"> </td>
-            <td class="notes"></td>
-         </tr>
          <tr class="extension">
             <td class="center"><span class="grey">n/a</span></td>
             <td class="center"><span class="cardinality">1 to ∞</span></td>
@@ -894,7 +870,7 @@ <h4 class="formal-name">Objective Implementation Status</h4>
                <p class="extension-name">control-objective-implementation-status</p>
             </td>
             <td class="xpaths">
-               <p class="binding">/o:assessment-results/o:results/o:finding/o:objective-status/o:prop</p>
+               <p class="binding">/o:assessment-results/o:results/o:finding/o:target/o:prop</p>
             </td>
             <td class="mdtype">token</td>
             <td class="defined-ids center"> </td>
@@ -918,7 +894,7 @@ <h4 class="formal-name">Leveraged Authorization</h4>
                <p class="extension-name">leveraged-authorization-uuid</p>
             </td>
             <td class="xpaths">
-               <p class="binding">/o:assessment-results/o:results/o:finding/o:objective-status/o:prop</p>
+               <p class="binding">/o:assessment-results/o:results/o:finding/o:target/o:prop</p>
             </td>
             <td class="mdtype">uuid</td>
             <td class="defined-ids center"> </td>
diff --git a/documents/Guide_to_OSCAL-based_FedRAMP_Plan_of_Action_and_Milestones_(POAM).pdf b/documents/Guide_to_OSCAL-based_FedRAMP_Plan_of_Action_and_Milestones_(POAM).pdf
index ef36ef75b..c87dcca5b 100644
Binary files a/documents/Guide_to_OSCAL-based_FedRAMP_Plan_of_Action_and_Milestones_(POAM).pdf and b/documents/Guide_to_OSCAL-based_FedRAMP_Plan_of_Action_and_Milestones_(POAM).pdf differ
diff --git a/documents/Guide_to_OSCAL-based_FedRAMP_Security_Assessment_Plans_(SAP).pdf b/documents/Guide_to_OSCAL-based_FedRAMP_Security_Assessment_Plans_(SAP).pdf
index 703048ea9..3a1bcc068 100644
Binary files a/documents/Guide_to_OSCAL-based_FedRAMP_Security_Assessment_Plans_(SAP).pdf and b/documents/Guide_to_OSCAL-based_FedRAMP_Security_Assessment_Plans_(SAP).pdf differ
diff --git a/documents/Guide_to_OSCAL-based_FedRAMP_Security_Assessment_Reports_(SAR).pdf b/documents/Guide_to_OSCAL-based_FedRAMP_Security_Assessment_Reports_(SAR).pdf
index 1e63b6404..40b9bd112 100644
Binary files a/documents/Guide_to_OSCAL-based_FedRAMP_Security_Assessment_Reports_(SAR).pdf and b/documents/Guide_to_OSCAL-based_FedRAMP_Security_Assessment_Reports_(SAR).pdf differ
diff --git a/src/content/resources/xml/FedRAMP_extensions.xml b/src/content/resources/xml/FedRAMP_extensions.xml
index 61f48cf62..f5c6fc941 100644
--- a/src/content/resources/xml/FedRAMP_extensions.xml
+++ b/src/content/resources/xml/FedRAMP_extensions.xml
@@ -3,9 +3,9 @@
    xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="BA710064-79AC-47D5-8F70-6749B359E7E2" >
    <metadata>
       <title>[EXPERIMENTAL] FedRAMP Extensions</title>
-      <published>2021-08-12T12:38:01Z</published>
-      <last-modified>2021-08-12T12:38:01Z</last-modified>
-      <version>fedramp1.1.0-oscal1.0.0</version>
+      <published>2021-10-22T05:55:26Z</published>
+      <last-modified>2021-10-22T05:55:26Z</last-modified>
+      <version>fedramp1.2.1-oscal1.0.0</version>
       <oscal-version>oscal-1.0.0</oscal-version>
       <revisions>
          <revision>
@@ -48,6 +48,14 @@
                 <p>Updated version reviewed for fedramp1.1.0-oscal1.0.0 release.</p>
             </remarks>
         </revision>
+        <revision>
+           <published>2021-10-22T05:55:26Z</published>
+           <version>fedramp1.2.1-oscal1.0.0</version>
+           <prop name="party-uuid" ns="https://fedramp.gov/ns/oscal">6b286b5d-8f07-4fa7-8847-1dd0d88f73fb</prop>
+           <remarks>
+              <p>Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release.</p>
+            </remarks>
+        </revision>
       </revisions>
       
       <role id="prepared-by">
@@ -675,7 +683,7 @@
       <extension-name>control-objective-implementation-status</extension-name>
       <formal-name>Objective Implementation Status</formal-name>
       <description>Indicates the implementation status of the control objective.</description>
-      <binding pattern="/o:assessment-results/o:results/o:finding/o:objective-status/o:prop"/>
+      <binding pattern="/o:assessment-results/o:results/o:finding/o:target/o:prop"/>
       <constraint>
          <matches data-type="token" />
          <has-cardinality min-occurs="0" max-occurs="1" />
@@ -706,7 +714,7 @@
       <extension-name>leveraged-authorization-uuid</extension-name>
       <formal-name>Leveraged Authorization</formal-name>
       <description>Indicates a leveraged authorization used for this control.</description>
-      <binding pattern="/o:assessment-results/o:results/o:finding/o:objective-status/o:prop"/>
+      <binding pattern="/o:assessment-results/o:results/o:finding/o:target/o:prop"/>
       <constraint>
          <matches data-type="uuid" />
          <has-cardinality min-occurs="0" max-occurs="unbounded" />
diff --git a/src/content/resources/xml/fedramp_threats.xml b/src/content/resources/xml/fedramp_threats.xml
index 7f8cb66e1..016c84c2e 100644
--- a/src/content/resources/xml/fedramp_threats.xml
+++ b/src/content/resources/xml/fedramp_threats.xml
@@ -3,9 +3,9 @@
 
     <metadata>
         <title>FedRAMP Defined Threat Table [Experimental]</title>
-        <published>2021-08-12T12:38:01Z</published>
-        <last-modified>2021-08-12T12:38:01Z</last-modified>
-        <version>fedramp1.1.0-oscal1.0.0</version>
+        <published>2021-10-22T05:55:26Z</published>
+        <last-modified>2021-10-22T05:55:26Z</last-modified>
+        <version>fedramp1.2.1-oscal1.0.0</version>
         <revisions>
             <revision>
                 <published>2019-06-01T00:00:00.00-04:00</published>
@@ -39,6 +39,14 @@
                     <p>Updated version reviewed for fedramp1.1.0-oscal1.0.0 releasess.</p>
                 </remarks>
             </revision>
+            <revision>
+                <published>2021-10-22T05:55:26Z</published>
+                <version>fedramp1.2.1-oscal1.0.0</version>
+                <prop name="party-uuid" ns="https://fedramp.gov/ns/oscal">6b286b5d-8f07-4fa7-8847-1dd0d88f73fb</prop>
+                <remarks>
+                    <p>Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release.</p>
+                </remarks>
+            </revision>
         </revisions>
         
         <role id="prepared-by">
diff --git a/src/content/resources/xml/fedramp_values.xml b/src/content/resources/xml/fedramp_values.xml
index 6adac6545..49de533ae 100644
--- a/src/content/resources/xml/fedramp_values.xml
+++ b/src/content/resources/xml/fedramp_values.xml
@@ -3,9 +3,9 @@
    <metadata>
       <title>[EXPERIMENTAL] FedRAMP Defined Identifiers and Accepted Values</title>
       <title-short>FedRAMP Data Values (Experimental)</title-short>
-      <published>2021-08-12T12:38:01Z</published>
-      <last-modified>2021-08-12T12:38:01Z</last-modified>
-      <version>fedramp1.1.0-oscal1.0.0</version>
+      <published>2021-10-22T05:55:26Z</published>
+      <last-modified>2021-10-22T05:55:26Z</last-modified>
+      <version>fedramp1.2.1-oscal1.0.0</version>
       <author>FedRAMP PMO</author>
       <description>This EXPERIMENTAL file provides the FedRAMP defined identifiers and acceptable values in a machine-readable format.</description>
       <remarks />
diff --git a/src/content/resources/xml/information-types.xml b/src/content/resources/xml/information-types.xml
index fc0963ed0..426f70709 100644
--- a/src/content/resources/xml/information-types.xml
+++ b/src/content/resources/xml/information-types.xml
@@ -2,9 +2,9 @@
 <information-types xmlns="https://fedramp.gov/ns/oscal" uuid="157BB1F7-8BE7-4642-9D5B-60B5995684F0">
     <metadata>
         <title>FedRAMP Acceptable Information Types (Experimental)</title>
-        <published>2021-08-12T12:38:01Z</published>
-        <last-modified>2021-08-12T12:38:01Z</last-modified>
-        <version>fedramp1.1.0-oscal1.0.0</version>
+        <published>2021-10-22T05:55:26Z</published>
+        <last-modified>2021-10-22T05:55:26Z</last-modified>
+        <version>fedramp1.2.1-oscal1.0.0</version>
         <revisions>
             <revision>
                 <published>2019-06-01T00:00:00.00-04:00</published>
@@ -38,6 +38,14 @@
                     <p>Updated version reviewed for fedramp1.1.0-oscal1.0.0 release.</p>
                 </remarks>
             </revision>
+            <revision>
+                <published>2021-10-22T05:55:26Z</published>
+                <version>fedramp1.2.1-oscal1.0.0</version>
+                <prop name="party-uuid" ns="https://fedramp.gov/ns/oscal">6b286b5d-8f07-4fa7-8847-1dd0d88f73fb</prop>
+                <remarks>
+                    <p>Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release.</p>
+                </remarks>
+            </revision>
         </revisions>
 
         <link rel="canonical"
diff --git a/src/content/templates/sar/xml/FedRAMP-SAR-OSCAL-Template.xml b/src/content/templates/sar/xml/FedRAMP-SAR-OSCAL-Template.xml
index d0c5e72b9..bad487e0e 100644
--- a/src/content/templates/sar/xml/FedRAMP-SAR-OSCAL-Template.xml
+++ b/src/content/templates/sar/xml/FedRAMP-SAR-OSCAL-Template.xml
@@ -5,9 +5,9 @@
    uuid="7ea5c269-ee26-48c8-b32c-91aa26339023">
    <metadata>
       <title>[System Name] FedRAMP Security Assessment Report (SAR)</title>
-      <published>2021-02-25T00:00:00.00-04:00</published>
-      <last-modified>2021-06-09T14:27:48.374-04:00</last-modified>
-      <version>fedramp1.1.0-oscal1.0.0</version>
+      <published>2021-10-22T02:22:00.000-04:00</published>
+      <last-modified>2021-10-22T02:22:00.000-04:00</last-modified>
+      <version>fedramp1.2.1-oscal1.0.0</version>
       <oscal-version>1.0.0</oscal-version>
       <prop name="marking" value="Controlled Unclassified Information"/>
       <!-- The following role definitions are required by FedRAMP -->
@@ -831,10 +831,10 @@
             <title>Remediation Title</title>
             <description>
                <p>A description of the recommended remediation.</p>
-               <p>TCW: Assessor's recommended remediation (type='recommendation').</p>
-               <p>Scans: Tool's recommended remediation (type='recommendation')</p>
-               <p>Pen Test: Assessor's recommended remediation (type='recommendation')</p>
-               <p>RET: Assessor's recommended remediation (type='recommendation').</p>
+               <p>TCW: Assessor's recommended remediation (lifecycle="recommendation").</p>
+               <p>Scans: Tool's recommended remediation (lifecycle="recommendation")</p>
+               <p>Pen Test: Assessor's recommended remediation (lifecycle="recommendation")</p>
+               <p>RET: Assessor's recommended remediation (lifecycle="recommendation").</p>
                <p>POA&amp;M: CSP's intended remediation (no type flag).</p>
             </description>
          </response>
@@ -871,10 +871,10 @@
             <title/>
             <description>
                <p>A description of the recommended remediation.</p>
-               <p>TCW: Assessor's recommended remediation (type='recommendation').</p>
-               <p>Scans: Tool's recommended remediation (type='recommendation')</p>
-               <p>Pen Test: Assessor's recommended remediation (type='recommendation')</p>
-               <p>RET: Assessor's recommended remediation (type='recommendation').</p>
+               <p>TCW: Assessor's recommended remediation (lifecycle="recommendation").</p>
+               <p>Scans: Tool's recommended remediation (lifecycle="recommendation")</p>
+               <p>Pen Test: Assessor's recommended remediation (lifecycle="recommendation")</p>
+               <p>RET: Assessor's recommended remediation (lifecycle="recommendation").</p>
                <p>POA&amp;M: CSP's intended remediation (no type flag).</p>
             </description>
             <origin>