diff --git a/schemas/policy/assign_message.xsd b/schemas/policy/assign_message.xsd
index 1237ea5d..b045e81a 100644
--- a/schemas/policy/assign_message.xsd
+++ b/schemas/policy/assign_message.xsd
@@ -182,8 +182,8 @@
   </xs:complexType>
   <xs:simpleType name="messageType">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="response"/>
       <xs:enumeration value="request"/>
+      <xs:enumeration value="response"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/schemas/policy/cache.xsd b/schemas/policy/cache.xsd
index c05d35b7..deec1728 100644
--- a/schemas/policy/cache.xsd
+++ b/schemas/policy/cache.xsd
@@ -9,17 +9,12 @@
   <xs:element name="Property" type="propertyBean"/>
   <xs:element name="ResponseCache" type="responseCacheBean"/>
   <xs:element name="stepDefinitionBean" type="stepDefinitionBean"/>
-  <xs:complexType name="responseCacheBean">
+  <xs:complexType name="invalidateCacheBean">
     <xs:complexContent>
       <xs:extension base="abstractCacheStepDefinitionBean">
         <xs:sequence>
-          <xs:element name="ExpirySettings" type="cacheExpiryBean" minOccurs="0"/>
-          <xs:element name="CacheLookupTimeoutInSeconds" type="xs:int" minOccurs="0"/>
-          <xs:element name="ExcludeErrorResponse" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="SkipCacheLookup" type="xs:string" minOccurs="0"/>
-          <xs:element name="SkipCachePopulation" type="xs:string" minOccurs="0"/>
-          <xs:element name="UseAcceptHeader" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="UseResponseCacheHeaders" type="xs:boolean" minOccurs="0"/>
+          <xs:element ref="CacheContext" minOccurs="0"/>
+          <xs:element name="PurgeChildEntries" type="xs:boolean"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -49,11 +44,11 @@
     </xs:complexContent>
   </xs:complexType>
   <xs:complexType name="leafBean" abstract="true"/>
-  <xs:complexType name="cacheExpiryBean">
+  <xs:complexType name="cacheContextBean">
     <xs:sequence>
-      <xs:element name="ExpiryDate" type="propertyBean" minOccurs="0"/>
-      <xs:element name="TimeOfDay" type="propertyBean" minOccurs="0"/>
-      <xs:element name="TimeoutInSec" type="propertyBean" minOccurs="0"/>
+      <xs:element name="APIProxyName" type="propertyBean" minOccurs="0"/>
+      <xs:element name="ProxyName" type="propertyBean" minOccurs="0"/>
+      <xs:element name="TargetName" type="propertyBean" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="propertyBean">
@@ -70,39 +65,44 @@
       <xs:element name="KeyFragment" type="propertyBean" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
-  <xs:complexType name="populateCacheBean">
+  <xs:complexType name="lookupCacheBean">
     <xs:complexContent>
       <xs:extension base="abstractCacheStepDefinitionBean">
         <xs:sequence>
-          <xs:element name="ExpirySettings" type="cacheExpiryBean" minOccurs="0"/>
-          <xs:element name="Source" type="xs:string"/>
+          <xs:element name="AssignTo" type="xs:string"/>
+          <xs:element name="CacheLookupTimeoutInSeconds" type="xs:int" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:complexType name="invalidateCacheBean">
+  <xs:complexType name="populateCacheBean">
     <xs:complexContent>
       <xs:extension base="abstractCacheStepDefinitionBean">
         <xs:sequence>
-          <xs:element ref="CacheContext" minOccurs="0"/>
-          <xs:element name="PurgeChildEntries" type="xs:boolean"/>
+          <xs:element name="ExpirySettings" type="cacheExpiryBean" minOccurs="0"/>
+          <xs:element name="Source" type="xs:string"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:complexType name="cacheContextBean">
+  <xs:complexType name="cacheExpiryBean">
     <xs:sequence>
-      <xs:element name="APIProxyName" type="propertyBean" minOccurs="0"/>
-      <xs:element name="ProxyName" type="propertyBean" minOccurs="0"/>
-      <xs:element name="TargetName" type="propertyBean" minOccurs="0"/>
+      <xs:element name="ExpiryDate" type="propertyBean" minOccurs="0"/>
+      <xs:element name="TimeOfDay" type="propertyBean" minOccurs="0"/>
+      <xs:element name="TimeoutInSec" type="propertyBean" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
-  <xs:complexType name="lookupCacheBean">
+  <xs:complexType name="responseCacheBean">
     <xs:complexContent>
       <xs:extension base="abstractCacheStepDefinitionBean">
         <xs:sequence>
-          <xs:element name="AssignTo" type="xs:string"/>
+          <xs:element name="ExpirySettings" type="cacheExpiryBean" minOccurs="0"/>
           <xs:element name="CacheLookupTimeoutInSeconds" type="xs:int" minOccurs="0"/>
+          <xs:element name="ExcludeErrorResponse" type="xs:boolean" minOccurs="0"/>
+          <xs:element name="SkipCacheLookup" type="xs:string" minOccurs="0"/>
+          <xs:element name="SkipCachePopulation" type="xs:string" minOccurs="0"/>
+          <xs:element name="UseAcceptHeader" type="xs:boolean" minOccurs="0"/>
+          <xs:element name="UseResponseCacheHeaders" type="xs:boolean" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
diff --git a/schemas/policy/extract_variables.xsd b/schemas/policy/extract_variables.xsd
index 8ebf84d4..f0b142c4 100644
--- a/schemas/policy/extract_variables.xsd
+++ b/schemas/policy/extract_variables.xsd
@@ -155,19 +155,19 @@
   </xs:simpleType>
   <xs:simpleType name="type">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="float"/>
+      <xs:enumeration value="string"/>
       <xs:enumeration value="integer"/>
       <xs:enumeration value="long"/>
       <xs:enumeration value="boolean"/>
-      <xs:enumeration value="string"/>
       <xs:enumeration value="nodeset"/>
+      <xs:enumeration value="float"/>
       <xs:enumeration value="double"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="match">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="first"/>
       <xs:enumeration value="all"/>
+      <xs:enumeration value="first"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/schemas/policy/jwt.xsd b/schemas/policy/jwt.xsd
index 7e441285..4f3623f6 100644
--- a/schemas/policy/jwt.xsd
+++ b/schemas/policy/jwt.xsd
@@ -1,30 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0">
   <xs:element name="DecodeJWT" type="decodeJWTStepDefinitionBean"/>
-
-  <xs:element name="FaultRule" type="faultRuleBean"/>
-
   <xs:element name="GenerateJWT" type="generateJWTStepDefinitionBean"/>
-
-  <xs:element name="Policy" type="policy"/>
-
-  <xs:element name="Properties" type="jaxbProperties"/>
-
   <xs:element name="Property" type="propertyBean"/>
-
-  <xs:element name="Step" type="step"/>
-
   <xs:element name="VerifyJWT" type="verifyJWTStepDefinitionBean"/>
-
-  <xs:element name="beanImpl" type="beanImpl"/>
-
-  <xs:element name="inlineBean" type="inlineBean"/>
-
-  <xs:element name="jaxbPropertyEntry" type="jaxbPropertyEntry"/>
-
   <xs:element name="stepDefinitionBean" type="stepDefinitionBean"/>
-
   <xs:complexType name="verifyJWTStepDefinitionBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -57,44 +37,20 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
   <xs:complexType name="stepDefinitionBean" abstract="true">
     <xs:complexContent>
       <xs:extension base="leafBean">
         <xs:sequence>
-          <xs:element name="Description" type="xs:string" minOccurs="0"/>
           <xs:element name="DisplayName" type="xs:string" minOccurs="0"/>
-          <xs:element name="FaultRules" minOccurs="0">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element ref="FaultRule" minOccurs="0" maxOccurs="unbounded"/>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element ref="Properties" minOccurs="0"/>
         </xs:sequence>
+        <xs:attribute name="name" type="xs:string" use="required"/>
         <xs:attribute name="async" type="xs:string"/>
         <xs:attribute name="continueOnError" type="xs:string"/>
         <xs:attribute name="enabled" type="xs:string"/>
-        <xs:attribute name="version" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
-  <xs:complexType name="leafBean" abstract="true">
-    <xs:complexContent>
-      <xs:extension base="beanImpl">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="beanImpl" abstract="true">
-    <xs:sequence/>
-    <xs:attribute name="isHybrid" type="xs:boolean"/>
-    <xs:attribute name="name" type="xs:string"/>
-  </xs:complexType>
-
+  <xs:complexType name="leafBean" abstract="true"/>
   <xs:complexType name="claim">
     <xs:simpleContent>
       <xs:extension base="xs:string">
@@ -105,7 +61,6 @@
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-
   <xs:complexType name="audienceBean">
     <xs:simpleContent>
       <xs:extension base="propertyBean">
@@ -113,7 +68,6 @@
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-
   <xs:complexType name="propertyBean">
     <xs:simpleContent>
       <xs:extension base="xs:string">
@@ -122,7 +76,6 @@
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-
   <xs:complexType name="publicKeyBean">
     <xs:complexContent>
       <xs:extension base="keyBean">
@@ -132,14 +85,12 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
   <xs:complexType name="keyBean">
     <xs:sequence>
       <xs:element name="Value" type="propertyBean" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="timeToLive" type="xs:string"/>
   </xs:complexType>
-
   <xs:complexType name="secretKeyBean">
     <xs:complexContent>
       <xs:extension base="encryptingKeyBean">
@@ -147,7 +98,6 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
   <xs:complexType name="encryptingKeyBean">
     <xs:complexContent>
       <xs:extension base="keyBean">
@@ -157,70 +107,6 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
-  <xs:complexType name="faultRuleBean">
-    <xs:complexContent>
-      <xs:extension base="inlineBean">
-        <xs:sequence>
-          <xs:element name="Condition" type="xs:string" minOccurs="0"/>
-          <xs:element name="Description" type="xs:string" minOccurs="0"/>
-          <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element ref="Step"/>
-            <xs:element ref="Policy"/>
-          </xs:choice>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="inlineBean" abstract="true">
-    <xs:complexContent>
-      <xs:extension base="beanImpl">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="step">
-    <xs:complexContent>
-      <xs:extension base="inlineBean">
-        <xs:sequence>
-          <xs:element name="Condition" type="xs:string" minOccurs="0"/>
-          <xs:element name="FaultRules" minOccurs="0">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element ref="FaultRule" minOccurs="0" maxOccurs="unbounded"/>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="Name" type="xs:string"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="policy">
-    <xs:complexContent>
-      <xs:extension base="step">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="jaxbProperties">
-    <xs:sequence>
-      <xs:element name="Property" type="jaxbPropertyEntry" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="jaxbPropertyEntry">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute name="name" type="xs:string"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
   <xs:complexType name="generateJWTStepDefinitionBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -254,7 +140,6 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
   <xs:complexType name="privateKeyBean">
     <xs:complexContent>
       <xs:extension base="encryptingKeyBean">
@@ -264,14 +149,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
-  <xs:complexType name="keyStoreSource">
-    <xs:sequence>
-      <xs:element name="Alias" type="propertyBean"/>
-      <xs:element name="Name" type="propertyBean"/>
-    </xs:sequence>
   </xs:complexType>
-
   <xs:complexType name="decodeJWTStepDefinitionBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -283,4 +161,3 @@
     </xs:complexContent>
   </xs:complexType>
 </xs:schema>
-
diff --git a/schemas/policy/message_logging.xsd b/schemas/policy/message_logging.xsd
index 396d4806..2a733e75 100644
--- a/schemas/policy/message_logging.xsd
+++ b/schemas/policy/message_logging.xsd
@@ -3,6 +3,13 @@
   <xs:element name="MessageLogging" type="messageLoggingBean"/>
   <xs:element name="RaiseAlert" type="raiseAlertBean"/>
   <xs:element name="stepDefinitionBean" type="stepDefinitionBean"/>
+  <xs:complexType name="raiseAlertBean">
+    <xs:complexContent>
+      <xs:extension base="messageLoggingBean">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
   <xs:complexType name="messageLoggingBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -30,19 +37,12 @@
     </xs:complexContent>
   </xs:complexType>
   <xs:complexType name="leafBean" abstract="true"/>
-  <xs:complexType name="raiseAlertBean">
-    <xs:complexContent>
-      <xs:extension base="messageLoggingBean">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
   <xs:simpleType name="logLevel">
     <xs:restriction base="xs:string">
       <xs:enumeration value="ALERT"/>
       <xs:enumeration value="WARN"/>
-      <xs:enumeration value="INFO"/>
       <xs:enumeration value="ERROR"/>
+      <xs:enumeration value="INFO"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/schemas/policy/message_validation.xsd b/schemas/policy/message_validation.xsd
index 4b2d5ec1..e8816bc9 100644
--- a/schemas/policy/message_validation.xsd
+++ b/schemas/policy/message_validation.xsd
@@ -43,8 +43,8 @@
   </xs:complexType>
   <xs:simpleType name="soapVersion">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="1.2"/>
       <xs:enumeration value="1.1"/>
+      <xs:enumeration value="1.2"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/schemas/policy/oauth_v1.xsd b/schemas/policy/oauth_v1.xsd
index cc18b277..38cbcbca 100644
--- a/schemas/policy/oauth_v1.xsd
+++ b/schemas/policy/oauth_v1.xsd
@@ -62,18 +62,6 @@
     </xs:sequence>
     <xs:attribute name="enabled" type="xs:string"/>
   </xs:complexType>
-  <xs:complexType name="deleteOAuthInfoBean">
-    <xs:complexContent>
-      <xs:extension base="stepDefinitionBean">
-        <xs:sequence>
-          <xs:element name="AccessToken" type="propertyBean" minOccurs="0"/>
-          <xs:element name="OAuthConfig" type="xs:string" minOccurs="0"/>
-          <xs:element name="RequestToken" type="propertyBean" minOccurs="0"/>
-          <xs:element name="Verifier" type="propertyBean" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
   <xs:complexType name="oAuthV1Bean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -158,20 +146,32 @@
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
+  <xs:complexType name="deleteOAuthInfoBean">
+    <xs:complexContent>
+      <xs:extension base="stepDefinitionBean">
+        <xs:sequence>
+          <xs:element name="AccessToken" type="propertyBean" minOccurs="0"/>
+          <xs:element name="OAuthConfig" type="xs:string" minOccurs="0"/>
+          <xs:element name="RequestToken" type="propertyBean" minOccurs="0"/>
+          <xs:element name="Verifier" type="propertyBean" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
   <xs:simpleType name="format">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="FORM_PARAM"/>
       <xs:enumeration value="XML"/>
+      <xs:enumeration value="FORM_PARAM"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="operation">
     <xs:restriction base="xs:string">
+      <xs:enumeration value="GenerateRequestToken"/>
       <xs:enumeration value="GenerateAccessToken"/>
-      <xs:enumeration value="ValidateToken"/>
+      <xs:enumeration value="VerifyAccessToken"/>
       <xs:enumeration value="GenerateVerifier"/>
+      <xs:enumeration value="ValidateToken"/>
       <xs:enumeration value="InvalidateToken"/>
-      <xs:enumeration value="VerifyAccessToken"/>
-      <xs:enumeration value="GenerateRequestToken"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/schemas/policy/oauth_v2_verify_api_key.xsd b/schemas/policy/oauth_v2_verify_api_key.xsd
index 18e7588e..89b45e64 100644
--- a/schemas/policy/oauth_v2_verify_api_key.xsd
+++ b/schemas/policy/oauth_v2_verify_api_key.xsd
@@ -10,6 +10,62 @@
   <xs:element name="SetOAuthV2Info" type="setOAuthV2InfoBean"/>
   <xs:element name="VerifyAPIKey" type="verifyAPIKeyBean"/>
   <xs:element name="stepDefinitionBean" type="stepDefinitionBean"/>
+  <xs:complexType name="getOAuthV2InfoBean">
+    <xs:complexContent>
+      <xs:extension base="stepDefinitionBean">
+        <xs:sequence>
+          <xs:element name="AccessToken" type="propertyBean" minOccurs="0"/>
+          <xs:element name="AuthorizationCode" type="propertyBean" minOccurs="0"/>
+          <xs:element name="ClientId" type="propertyBean" minOccurs="0"/>
+          <xs:element name="OAuthConfig" type="xs:string" minOccurs="0"/>
+          <xs:element name="IgnoreAccessTokenStatus" type="xs:boolean" minOccurs="0"/>
+          <xs:element name="RefreshToken" type="propertyBean" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="stepDefinitionBean" abstract="true">
+    <xs:complexContent>
+      <xs:extension base="leafBean">
+        <xs:sequence>
+          <xs:element name="DisplayName" type="xs:string" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="async" type="xs:string"/>
+        <xs:attribute name="continueOnError" type="xs:string"/>
+        <xs:attribute name="enabled" type="xs:string"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="leafBean" abstract="true"/>
+  <xs:complexType name="propertyBean">
+    <xs:simpleContent>
+      <xs:extension base="xs:string">
+        <xs:attribute name="ref" type="xs:string"/>
+        <xs:attribute name="type" type="xs:string"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="verifyAPIKeyBean">
+    <xs:complexContent>
+      <xs:extension base="stepDefinitionBean">
+        <xs:sequence>
+          <xs:element name="APIKey" type="propertyBean" minOccurs="0"/>
+          <xs:element name="OAuthConfig" type="xs:string" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="getAPIProductBean">
+    <xs:complexContent>
+      <xs:extension base="stepDefinitionBean">
+        <xs:sequence>
+          <xs:element name="APIProduct" type="propertyBean" minOccurs="0"/>
+          <xs:element name="OAuthConfig" type="xs:string" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
   <xs:complexType name="oAuthV2Bean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -64,20 +120,6 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:complexType name="stepDefinitionBean" abstract="true">
-    <xs:complexContent>
-      <xs:extension base="leafBean">
-        <xs:sequence>
-          <xs:element name="DisplayName" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:string" use="required"/>
-        <xs:attribute name="async" type="xs:string"/>
-        <xs:attribute name="continueOnError" type="xs:string"/>
-        <xs:attribute name="enabled" type="xs:string"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="leafBean" abstract="true"/>
   <xs:complexType name="customAttribute">
     <xs:simpleContent>
       <xs:extension base="xs:string">
@@ -102,14 +144,6 @@
     </xs:sequence>
     <xs:attribute name="enabled" type="xs:string"/>
   </xs:complexType>
-  <xs:complexType name="propertyBean">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute name="ref" type="xs:string"/>
-        <xs:attribute name="type" type="xs:string"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
   <xs:complexType name="propertyExpiryBean">
     <xs:simpleContent>
       <xs:extension base="xs:long">
@@ -125,46 +159,6 @@
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-  <xs:complexType name="setOAuthV2InfoBean">
-    <xs:complexContent>
-      <xs:extension base="stepDefinitionBean">
-        <xs:sequence>
-          <xs:element name="AccessToken" type="propertyBean" minOccurs="0"/>
-          <xs:element name="Attributes" minOccurs="0">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="Attribute" type="customAttribute" minOccurs="0" maxOccurs="unbounded"/>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="getAPIProductBean">
-    <xs:complexContent>
-      <xs:extension base="stepDefinitionBean">
-        <xs:sequence>
-          <xs:element name="APIProduct" type="propertyBean" minOccurs="0"/>
-          <xs:element name="OAuthConfig" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="getOAuthV2InfoBean">
-    <xs:complexContent>
-      <xs:extension base="stepDefinitionBean">
-        <xs:sequence>
-          <xs:element name="AccessToken" type="propertyBean" minOccurs="0"/>
-          <xs:element name="AuthorizationCode" type="propertyBean" minOccurs="0"/>
-          <xs:element name="ClientId" type="propertyBean" minOccurs="0"/>
-          <xs:element name="OAuthConfig" type="xs:string" minOccurs="0"/>
-          <xs:element name="IgnoreAccessTokenStatus" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="RefreshToken" type="propertyBean" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
   <xs:complexType name="deleteOAuthV2InfoBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -176,12 +170,18 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:complexType name="verifyAPIKeyBean">
+  <xs:complexType name="setOAuthV2InfoBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
         <xs:sequence>
-          <xs:element name="APIKey" type="propertyBean" minOccurs="0"/>
-          <xs:element name="OAuthConfig" type="xs:string" minOccurs="0"/>
+          <xs:element name="AccessToken" type="propertyBean" minOccurs="0"/>
+          <xs:element name="Attributes" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="Attribute" type="customAttribute" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
diff --git a/schemas/policy/quota_spike_ratelimit.xsd b/schemas/policy/quota_spike_ratelimit.xsd
index 52816ab2..35ca2949 100644
--- a/schemas/policy/quota_spike_ratelimit.xsd
+++ b/schemas/policy/quota_spike_ratelimit.xsd
@@ -12,15 +12,11 @@
   <xs:element name="ResetQuotaStepDefinition" type="quota"/>
   <xs:element name="SpikeArrest" type="spikeArrestBean"/>
   <xs:element name="stepDefinitionBean" type="stepDefinitionBean"/>
-  <xs:complexType name="concurrentRatelimitBean">
+  <xs:complexType name="resetQuotaBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
         <xs:sequence>
-          <xs:element ref="AllowConnections"/>
-          <xs:element name="Distributed" type="xs:boolean"/>
-          <xs:element name="TargetIdentifier" type="targetIdentifier"/>
-          <xs:element name="StrictOnTtl" type="xs:boolean"/>
-          <xs:element name="Synchronous" type="xs:boolean"/>
+          <xs:element name="Quota" type="quota"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -39,25 +35,6 @@
     </xs:complexContent>
   </xs:complexType>
   <xs:complexType name="leafBean" abstract="true"/>
-  <xs:complexType name="connectionsAllowedLimit">
-    <xs:sequence/>
-    <xs:attribute name="count" type="xs:long" use="required"/>
-    <xs:attribute name="ttl" type="xs:int" use="required"/>
-  </xs:complexType>
-  <xs:complexType name="targetIdentifier">
-    <xs:sequence/>
-    <xs:attribute name="name" type="xs:string"/>
-    <xs:attribute name="ref" type="xs:string"/>
-  </xs:complexType>
-  <xs:complexType name="resetQuotaBean">
-    <xs:complexContent>
-      <xs:extension base="stepDefinitionBean">
-        <xs:sequence>
-          <xs:element name="Quota" type="quota"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
   <xs:complexType name="quota">
     <xs:sequence>
       <xs:element name="Identifier" type="identifier" minOccurs="0" maxOccurs="unbounded"/>
@@ -88,6 +65,29 @@
     <xs:attribute name="name" type="xs:string"/>
     <xs:attribute name="ref" type="xs:string"/>
   </xs:complexType>
+  <xs:complexType name="concurrentRatelimitBean">
+    <xs:complexContent>
+      <xs:extension base="stepDefinitionBean">
+        <xs:sequence>
+          <xs:element ref="AllowConnections"/>
+          <xs:element name="Distributed" type="xs:boolean"/>
+          <xs:element name="TargetIdentifier" type="targetIdentifier"/>
+          <xs:element name="StrictOnTtl" type="xs:boolean"/>
+          <xs:element name="Synchronous" type="xs:boolean"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="connectionsAllowedLimit">
+    <xs:sequence/>
+    <xs:attribute name="count" type="xs:long" use="required"/>
+    <xs:attribute name="ttl" type="xs:int" use="required"/>
+  </xs:complexType>
+  <xs:complexType name="targetIdentifier">
+    <xs:sequence/>
+    <xs:attribute name="name" type="xs:string"/>
+    <xs:attribute name="ref" type="xs:string"/>
+  </xs:complexType>
   <xs:complexType name="quotaBean">
     <xs:complexContent>
       <xs:extension base="rateLimitBean">
@@ -164,6 +164,7 @@
       <xs:extension base="rateLimitBean">
         <xs:sequence>
           <xs:element name="Rate" type="peakMessageRate"/>
+          <xs:element name="UseEffectiveCount" type="xs:boolean"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
diff --git a/schemas/policy/regular_expression_protection.xsd b/schemas/policy/regular_expression_protection.xsd
index 958c8486..6034339e 100644
--- a/schemas/policy/regular_expression_protection.xsd
+++ b/schemas/policy/regular_expression_protection.xsd
@@ -136,13 +136,13 @@
   </xs:complexType>
   <xs:simpleType name="type">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="double"/>
-      <xs:enumeration value="string"/>
+      <xs:enumeration value="long"/>
       <xs:enumeration value="nodeset"/>
+      <xs:enumeration value="double"/>
       <xs:enumeration value="boolean"/>
-      <xs:enumeration value="long"/>
-      <xs:enumeration value="float"/>
       <xs:enumeration value="integer"/>
+      <xs:enumeration value="float"/>
+      <xs:enumeration value="string"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>