diff --git a/demo/agent/agent.cfg b/demo/agent/agent.cfg
index a407915d..a0ef9699 100644
--- a/demo/agent/agent.cfg
+++ b/demo/agent/agent.cfg
@@ -1,5 +1,5 @@
 Devices = Devices.xml
-SchemaVersion = 2.2
+SchemaVersion = 2.3
 WorkerThreads = 3
 MonitorConfigFiles = yes
 Port = 5001
diff --git a/demo/agent/agent.dock b/demo/agent/agent.dock
index 472d5c60..c4768b3e 100644
--- a/demo/agent/agent.dock
+++ b/demo/agent/agent.dock
@@ -1,5 +1,5 @@
 Devices = Devices.xml
-SchemaVersion = 2.0
+SchemaVersion = 2.3
 WorkerThreads = 3
 MonitorConfigFiles = yes
 Port = 5000
diff --git a/demo/agent/agent.mac b/demo/agent/agent.mac
index e9d3f23d..a0ef9699 100644
--- a/demo/agent/agent.mac
+++ b/demo/agent/agent.mac
@@ -1,5 +1,5 @@
 Devices = Devices.xml
-SchemaVersion = 2.0
+SchemaVersion = 2.3
 WorkerThreads = 3
 MonitorConfigFiles = yes
 Port = 5001
diff --git a/schemas/MTConnectStreams_2.3.xsd b/schemas/MTConnectStreams_2.3.xsd
index 28cfbed3..2ba3c4f4 100644
--- a/schemas/MTConnectStreams_2.3.xsd
+++ b/schemas/MTConnectStreams_2.3.xsd
@@ -45125,6 +45125,15 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
     </xs:annotation>
     <xs:restriction base='xs:string'/>
   </xs:simpleType>
+  <xs:simpleType name='ConditionIdType'>
+    <xs:annotation>
+      <xs:documentation>
+        Identifier of an individual condition activation provided by a piece of
+        equipment
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base='xs:string'/>
+  </xs:simpleType>
   <xs:simpleType name='QualifierType'>
     <xs:annotation>
       <xs:documentation>
@@ -45192,7 +45201,25 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
             </xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name='conditionId' type='IDType' use='required'>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:element abstract='true' name='Condition' type='ConditionType'>
+    <xs:annotation>
+      <xs:documentation>
+        Description
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name='ActivatedConditionType' abstract='true'>
+    <xs:annotation>
+      <xs:documentation>
+        Condition that has transitioned from Normal to either Warning or Fault
+      </xs:documentation>
+    </xs:annotation>
+    <xs:simpleContent>
+      <xs:extension base='ConditionType'>
+        <xs:attribute name='conditionId' type='ConditionIdType' use='required'>
           <xs:annotation>
             <xs:documentation>
               Identifier of an individual condition activation provided by a
@@ -45203,10 +45230,10 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-  <xs:element abstract='true' name='Condition' type='ConditionType'>
+  <xs:element abstract='true' name='ActivatedCondition' type='ActivatedConditionType' substitutionGroup='Condition'>
     <xs:annotation>
       <xs:documentation>
-        Description
+        Condition that has transitioned from Normal to either Warning or Fault
       </xs:documentation>
     </xs:annotation>
   </xs:element>
@@ -45254,10 +45281,10 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
       </xs:documentation>
     </xs:annotation>
     <xs:simpleContent>
-      <xs:extension base='ConditionType'/>
+      <xs:extension base='ActivatedConditionType'/>
     </xs:simpleContent>
   </xs:complexType>
-  <xs:element name='Warning' type='WarningType' substitutionGroup='Condition'>
+  <xs:element name='Warning' type='WarningType' substitutionGroup='ActivatedCondition'>
     <xs:annotation>
       <xs:documentation>
         {{term(condition state)}} that requires concern and supervision and may
@@ -45273,10 +45300,10 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
       </xs:documentation>
     </xs:annotation>
     <xs:simpleContent>
-      <xs:extension base='ConditionType'/>
+      <xs:extension base='ActivatedConditionType'/>
     </xs:simpleContent>
   </xs:complexType>
-  <xs:element name='Fault' type='FaultType' substitutionGroup='Condition'>
+  <xs:element name='Fault' type='FaultType' substitutionGroup='ActivatedCondition'>
     <xs:annotation>
       <xs:documentation>
         {{term(condition state)}} that requires intervention to continue
diff --git a/schemas/MTConnectStreams_2.3_1.0.xsd b/schemas/MTConnectStreams_2.3_1.0.xsd
index d9b34b49..edad26c7 100644
--- a/schemas/MTConnectStreams_2.3_1.0.xsd
+++ b/schemas/MTConnectStreams_2.3_1.0.xsd
@@ -45125,6 +45125,15 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
     </xs:annotation>
     <xs:restriction base='xs:string'/>
   </xs:simpleType>
+  <xs:simpleType name='ConditionIdType'>
+    <xs:annotation>
+      <xs:documentation>
+        Identifier of an individual condition activation provided by a piece of
+        equipment
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base='xs:string'/>
+  </xs:simpleType>
   <xs:simpleType name='QualifierType'>
     <xs:annotation>
       <xs:documentation>
@@ -45192,7 +45201,25 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
             </xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name='conditionId' type='IDType' use='required'>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:element abstract='true' name='Condition' type='ConditionType'>
+    <xs:annotation>
+      <xs:documentation>
+        Description
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name='ActivatedConditionType' abstract='true'>
+    <xs:annotation>
+      <xs:documentation>
+        Condition that has transitioned from Normal to either Warning or Fault
+      </xs:documentation>
+    </xs:annotation>
+    <xs:simpleContent>
+      <xs:extension base='ConditionType'>
+        <xs:attribute name='conditionId' type='ConditionIdType' use='required'>
           <xs:annotation>
             <xs:documentation>
               Identifier of an individual condition activation provided by a
@@ -45203,10 +45230,10 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-  <xs:element abstract='true' name='Condition' type='ConditionType'>
+  <xs:element abstract='true' name='ActivatedCondition' type='ActivatedConditionType' substitutionGroup='Condition'>
     <xs:annotation>
       <xs:documentation>
-        Description
+        Condition that has transitioned from Normal to either Warning or Fault
       </xs:documentation>
     </xs:annotation>
   </xs:element>
@@ -45254,10 +45281,10 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
       </xs:documentation>
     </xs:annotation>
     <xs:simpleContent>
-      <xs:extension base='ConditionType'/>
+      <xs:extension base='ActivatedConditionType'/>
     </xs:simpleContent>
   </xs:complexType>
-  <xs:element name='Warning' type='WarningType' substitutionGroup='Condition'>
+  <xs:element name='Warning' type='WarningType' substitutionGroup='ActivatedCondition'>
     <xs:annotation>
       <xs:documentation>
         {{term(condition state)}} that requires concern and supervision and may
@@ -45273,10 +45300,10 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
       </xs:documentation>
     </xs:annotation>
     <xs:simpleContent>
-      <xs:extension base='ConditionType'/>
+      <xs:extension base='ActivatedConditionType'/>
     </xs:simpleContent>
   </xs:complexType>
-  <xs:element name='Fault' type='FaultType' substitutionGroup='Condition'>
+  <xs:element name='Fault' type='FaultType' substitutionGroup='ActivatedCondition'>
     <xs:annotation>
       <xs:documentation>
         {{term(condition state)}} that requires intervention to continue