diff --git a/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/DataSourcesExtension.java b/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/DataSourcesExtension.java
index f121cc2628cf..8bdd63b303f5 100644
--- a/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/DataSourcesExtension.java
+++ b/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/DataSourcesExtension.java
@@ -105,11 +105,13 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import static org.jboss.as.controller.parsing.ParseUtils.requireNoContent;
 
+import java.util.Arrays;
 import java.util.List;
 
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 
+import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.Extension;
 import org.jboss.as.controller.ExtensionContext;
 import org.jboss.as.controller.ModelVersion;
@@ -194,6 +196,35 @@ public static final class DataSourceSubsystemParser implements XMLStreamConstant
             XMLElementWriter<SubsystemMarshallingContext> {
 
 
+        private static final SimpleAttributeDefinition[] COMMON_SIMPLE_DS_ATTRIBUTES = {
+                DATASOURCE_DRIVER, URL_DELIMITER, URL_SELECTOR_STRATEGY_CLASS_NAME, NEW_CONNECTION_SQL, TRANSACTION_ISOLATION
+        };
+
+        private static final SimpleAttributeDefinition[] POOL_ATTRIBUTES = {
+                MIN_POOL_SIZE, INITIAL_POOL_SIZE, MAX_POOL_SIZE, POOL_PREFILL, POOL_FAIR, POOL_USE_STRICT_MIN, POOL_FLUSH_STRATEGY, ALLOW_MULTIPLE_USERS
+        };
+
+        private static final SimpleAttributeDefinition[] XA_POOL_ATTRIBUTES = {
+                SAME_RM_OVERRIDE, INTERLEAVING, NO_TX_SEPARATE_POOL, PAD_XID, WRAP_XA_RESOURCE
+        };
+
+        private static final SimpleAttributeDefinition[] TIMEOUT_ATTRIBUTES = {
+                SET_TX_QUERY_TIMEOUT, BLOCKING_TIMEOUT_WAIT_MILLIS, IDLETIMEOUTMINUTES, QUERY_TIMEOUT, USE_TRY_LOCK,
+                ALLOCATION_RETRY, ALLOCATION_RETRY_WAIT_MILLIS, XA_RESOURCE_TIMEOUT
+        };
+
+        private static final SimpleAttributeDefinition[] RECOVERY_ATTRIBUTES = {
+                RECOVERY_SECURITY_DOMAIN, RECOVERY_AUTHENTICATION_CONTEXT, RECOVERY_CREDENTIAL_REFERENCE, RECOVERY_ELYTRON_ENABLED
+        };
+
+        private static final SimpleAttributeDefinition[] SECURITY_ATTRIBUTES = {
+                SECURITY_DOMAIN, AUTHENTICATION_CONTEXT, CREDENTIAL_REFERENCE, ELYTRON_ENABLED
+        };
+
+        private static final SimpleAttributeDefinition[] STATEMENT_ATTRIBUTES = {
+                TRACK_STATEMENTS, PREPARED_STATEMENTS_CACHE_SIZE, SHARE_PREPARED_STATEMENTS
+        };
+
         /**
          * {@inheritDoc}
          */
@@ -264,9 +295,7 @@ private void writeDS(XMLExtendedStreamWriter writer, boolean isXADataSource, Mod
                 STATISTICS_ENABLED.marshallAsAttribute(dataSourceNode, writer);
 
                 if (!isXADataSource) {
-                    CONNECTION_URL.marshallAsElement(dataSourceNode, writer);
-                    DRIVER_CLASS.marshallAsElement(dataSourceNode, writer);
-                    DATASOURCE_CLASS.marshallAsElement(dataSourceNode, writer);
+                    marshallAsElements(dataSourceNode, writer, CONNECTION_URL, DRIVER_CLASS, DATASOURCE_CLASS);
                     if (dataSourceNode.hasDefined(CONNECTION_PROPERTIES.getName())) {
                         for (Property connectionProperty : dataSourceNode.get(CONNECTION_PROPERTIES.getName()).asPropertyList()) {
                             writeProperty(writer, dataSourceNode, connectionProperty.getName(), connectionProperty
@@ -282,49 +311,24 @@ private void writeDS(XMLExtendedStreamWriter writer, boolean isXADataSource, Mod
                         }
 
                     }
-                    XA_DATASOURCE_CLASS.marshallAsElement(dataSourceNode, writer);
-                    URL_PROPERTY.marshallAsElement(dataSourceNode, writer);
+                    marshallAsElements(dataSourceNode, writer, XA_DATASOURCE_CLASS, URL_PROPERTY);
                 }
-                DATASOURCE_DRIVER.marshallAsElement(dataSourceNode, writer);
-                URL_DELIMITER.marshallAsElement(dataSourceNode, writer);
-                URL_SELECTOR_STRATEGY_CLASS_NAME.marshallAsElement(dataSourceNode, writer);
-                NEW_CONNECTION_SQL.marshallAsElement(dataSourceNode, writer);
-                TRANSACTION_ISOLATION.marshallAsElement(dataSourceNode, writer);
-
-                boolean poolRequired = INITIAL_POOL_SIZE.isMarshallable(dataSourceNode) ||
-                        MIN_POOL_SIZE.isMarshallable(dataSourceNode) ||
-                        MAX_POOL_SIZE.isMarshallable(dataSourceNode) ||
-                        POOL_PREFILL.isMarshallable(dataSourceNode) ||
-                        POOL_FAIR.isMarshallable(dataSourceNode) ||
-                        POOL_USE_STRICT_MIN.isMarshallable(dataSourceNode) ||
-                        POOL_FLUSH_STRATEGY.isMarshallable(dataSourceNode) ||
-                        ALLOW_MULTIPLE_USERS.isMarshallable(dataSourceNode) ||
+                marshallAsElements(dataSourceNode, writer, COMMON_SIMPLE_DS_ATTRIBUTES);
+
+                boolean poolRequired = isAnyRequired(dataSourceNode, POOL_ATTRIBUTES) ||
                         CONNECTION_LISTENER_CLASS.isMarshallable(dataSourceNode) ||
                         CONNECTION_LISTENER_PROPERTIES.isMarshallable(dataSourceNode);
                 if (isXADataSource) {
-                    poolRequired = poolRequired
-                            || SAME_RM_OVERRIDE.isMarshallable(dataSourceNode) ||
-                            INTERLEAVING.isMarshallable(dataSourceNode) ||
-                            NO_TX_SEPARATE_POOL.isMarshallable(dataSourceNode) ||
-                            PAD_XID.isMarshallable(dataSourceNode) ||
-                            WRAP_XA_RESOURCE.isMarshallable(dataSourceNode);
+                    poolRequired = poolRequired || isAnyRequired(dataSourceNode, XA_POOL_ATTRIBUTES);
                 }
-                final boolean capacityRequired = CAPACITY_INCREMENTER_CLASS.isMarshallable(dataSourceNode) ||
-                        CAPACITY_INCREMENTER_PROPERTIES.isMarshallable(dataSourceNode) ||
-                        CAPACITY_DECREMENTER_CLASS.isMarshallable(dataSourceNode) ||
-                        CAPACITY_DECREMENTER_PROPERTIES.isMarshallable(dataSourceNode);
+
+                final boolean capacityRequired = isAnyRequired(dataSourceNode, CAPACITY_INCREMENTER_CLASS,
+                        CAPACITY_INCREMENTER_PROPERTIES, CAPACITY_DECREMENTER_CLASS, CAPACITY_DECREMENTER_PROPERTIES);
                 poolRequired = poolRequired || capacityRequired;
                 if (poolRequired) {
                     writer.writeStartElement(isXADataSource ? XaDataSource.Tag.XA_POOL.getLocalName() : DataSource.Tag.POOL
                             .getLocalName());
-                    MIN_POOL_SIZE.marshallAsElement(dataSourceNode, writer);
-                    INITIAL_POOL_SIZE.marshallAsElement(dataSourceNode, writer);
-                    MAX_POOL_SIZE.marshallAsElement(dataSourceNode, writer);
-                    POOL_PREFILL.marshallAsElement(dataSourceNode, writer);
-                    POOL_FAIR.marshallAsElement(dataSourceNode, writer);
-                    POOL_USE_STRICT_MIN.marshallAsElement(dataSourceNode, writer);
-                    POOL_FLUSH_STRATEGY.marshallAsElement(dataSourceNode, writer);
-                    ALLOW_MULTIPLE_USERS.marshallAsElement(dataSourceNode, writer);
+                    marshallAsElements(dataSourceNode, writer, POOL_ATTRIBUTES);
 
                     if (dataSourceNode.hasDefined(CONNECTION_LISTENER_CLASS.getName())) {
                         writer.writeStartElement(DsPool.Tag.CONNECTION_LISTENER.getLocalName());
@@ -344,43 +348,30 @@ private void writeDS(XMLExtendedStreamWriter writer, boolean isXADataSource, Mod
                         writer.writeEndElement();
                     }
 
-
                     if (capacityRequired) {
                         writer.writeStartElement(DsPool.Tag.CAPACITY.getLocalName());
                         if (dataSourceNode.hasDefined(CAPACITY_INCREMENTER_CLASS.getName())) {
                             writer.writeStartElement(Capacity.Tag.INCREMENTER.getLocalName());
                             CAPACITY_INCREMENTER_CLASS.marshallAsAttribute(dataSourceNode, writer);
                             CAPACITY_INCREMENTER_PROPERTIES.marshallAsElement(dataSourceNode, writer);
-
                             writer.writeEndElement();
                         }
                         if (dataSourceNode.hasDefined(CAPACITY_DECREMENTER_CLASS.getName())) {
                             writer.writeStartElement(Capacity.Tag.DECREMENTER.getLocalName());
                             CAPACITY_DECREMENTER_CLASS.marshallAsAttribute(dataSourceNode, writer);
                             CAPACITY_DECREMENTER_PROPERTIES.marshallAsElement(dataSourceNode, writer);
-
                             writer.writeEndElement();
                         }
                         writer.writeEndElement();
                     }
                     if (isXADataSource) {
-                        SAME_RM_OVERRIDE.marshallAsElement(dataSourceNode, writer);
-                        INTERLEAVING.marshallAsElement(dataSourceNode, writer);
-                        NO_TX_SEPARATE_POOL.marshallAsElement(dataSourceNode, writer);
-                        PAD_XID.marshallAsElement(dataSourceNode, writer);
-                        WRAP_XA_RESOURCE.marshallAsElement(dataSourceNode, writer);
+                        marshallAsElements(dataSourceNode, writer, XA_POOL_ATTRIBUTES);
                     }
                     writer.writeEndElement();
                 }
-
-                boolean recoveryRequired = RECOVERY_USERNAME.isMarshallable(dataSourceNode) ||
-                        RECOVERY_PASSWORD.isMarshallable(dataSourceNode) ||
-                        RECOVERY_SECURITY_DOMAIN.isMarshallable(dataSourceNode) ||
-                        RECOVERY_ELYTRON_ENABLED.isMarshallable(dataSourceNode) ||
-                        RECOVER_PLUGIN_CLASSNAME.isMarshallable(dataSourceNode) ||
-                        RECOVERY_CREDENTIAL_REFERENCE.isMarshallable(dataSourceNode) ||
-                        NO_RECOVERY.isMarshallable(dataSourceNode) ||
-                        RECOVER_PLUGIN_PROPERTIES.isMarshallable(dataSourceNode);
+                boolean recoveryRequired = isAnyRequired(dataSourceNode, RECOVERY_USERNAME, RECOVERY_PASSWORD,
+                        RECOVERY_SECURITY_DOMAIN, RECOVERY_ELYTRON_ENABLED, RECOVER_PLUGIN_CLASSNAME,
+                        RECOVERY_CREDENTIAL_REFERENCE, NO_RECOVERY, RECOVER_PLUGIN_PROPERTIES);
                 if (recoveryRequired && isXADataSource) {
                     writer.writeStartElement(XaDataSource.Tag.RECOVERY.getLocalName());
                     NO_RECOVERY.marshallAsAttribute(dataSourceNode, writer);
@@ -388,10 +379,7 @@ private void writeDS(XMLExtendedStreamWriter writer, boolean isXADataSource, Mod
                         writer.writeStartElement(Recovery.Tag.RECOVER_CREDENTIAL.getLocalName());
                         RECOVERY_USERNAME.marshallAsAttribute(dataSourceNode, writer);
                         RECOVERY_PASSWORD.marshallAsAttribute(dataSourceNode, writer);
-                        RECOVERY_AUTHENTICATION_CONTEXT.marshallAsElement(dataSourceNode, writer);
-                        RECOVERY_SECURITY_DOMAIN.marshallAsElement(dataSourceNode, writer);
-                        RECOVERY_CREDENTIAL_REFERENCE.marshallAsElement(dataSourceNode, writer);
-                        RECOVERY_ELYTRON_ENABLED.marshallAsElement(dataSourceNode, writer);
+                        marshallAsElements(dataSourceNode, writer, RECOVERY_ATTRIBUTES);
                         writer.writeEndElement();
                     }
                     if (hasAnyOf(dataSourceNode, RECOVER_PLUGIN_CLASSNAME)) {
@@ -412,22 +400,13 @@ private void writeDS(XMLExtendedStreamWriter writer, boolean isXADataSource, Mod
                     }
                     writer.writeEndElement();
                 }
-
-                boolean securityRequired = USERNAME.isMarshallable(dataSourceNode) ||
-                        PASSWORD.isMarshallable(dataSourceNode) ||
-                        CREDENTIAL_REFERENCE.isMarshallable(dataSourceNode) ||
-                        SECURITY_DOMAIN.isMarshallable(dataSourceNode) ||
-                        ELYTRON_ENABLED.isMarshallable(dataSourceNode) ||
-                        REAUTH_PLUGIN_CLASSNAME.isMarshallable(dataSourceNode) ||
-                        REAUTHPLUGIN_PROPERTIES.isMarshallable(dataSourceNode);
+                boolean securityRequired = isAnyRequired(dataSourceNode, USERNAME, PASSWORD, CREDENTIAL_REFERENCE,
+                        SECURITY_DOMAIN, ELYTRON_ENABLED, REAUTH_PLUGIN_CLASSNAME, REAUTHPLUGIN_PROPERTIES);
                 if (securityRequired) {
                     writer.writeStartElement(DataSource.Tag.SECURITY.getLocalName());
                     USERNAME.marshallAsAttribute(dataSourceNode, writer);
                     PASSWORD.marshallAsAttribute(dataSourceNode, writer);
-                    SECURITY_DOMAIN.marshallAsElement(dataSourceNode, writer);
-                    AUTHENTICATION_CONTEXT.marshallAsElement(dataSourceNode, writer);
-                    CREDENTIAL_REFERENCE.marshallAsElement(dataSourceNode, writer);
-                    ELYTRON_ENABLED.marshallAsElement(dataSourceNode, writer);
+                    marshallAsElements(dataSourceNode, writer, SECURITY_ATTRIBUTES);
 
                     if (dataSourceNode.hasDefined(REAUTH_PLUGIN_CLASSNAME.getName())) {
                         writer.writeStartElement(DsSecurity.Tag.REAUTH_PLUGIN.getLocalName());
@@ -448,20 +427,11 @@ private void writeDS(XMLExtendedStreamWriter writer, boolean isXADataSource, Mod
                     writer.writeEndElement();
                 }
 
-                boolean validationRequired = VALID_CONNECTION_CHECKER_CLASSNAME.isMarshallable(dataSourceNode) ||
-                        VALID_CONNECTION_CHECKER_MODULE.isMarshallable(dataSourceNode) ||
-                        VALID_CONNECTION_CHECKER_PROPERTIES.isMarshallable(dataSourceNode) ||
-                        CHECK_VALID_CONNECTION_SQL.isMarshallable(dataSourceNode) ||
-                        VALIDATE_ON_MATCH.isMarshallable(dataSourceNode) ||
-                        BACKGROUNDVALIDATION.isMarshallable(dataSourceNode) ||
-                        BACKGROUNDVALIDATIONMILLIS.isMarshallable(dataSourceNode) ||
-                        USE_FAST_FAIL.isMarshallable(dataSourceNode) ||
-                        STALE_CONNECTION_CHECKER_CLASSNAME.isMarshallable(dataSourceNode) ||
-                        STALE_CONNECTION_CHECKER_MODULE.isMarshallable(dataSourceNode) ||
-                        STALE_CONNECTION_CHECKER_PROPERTIES.isMarshallable(dataSourceNode) ||
-                        EXCEPTION_SORTER_CLASSNAME.isMarshallable(dataSourceNode) ||
-                        EXCEPTION_SORTER_MODULE.isMarshallable(dataSourceNode) ||
-                        EXCEPTION_SORTER_PROPERTIES.isMarshallable(dataSourceNode);
+                boolean validationRequired = isAnyRequired(dataSourceNode, VALID_CONNECTION_CHECKER_CLASSNAME,
+                        VALID_CONNECTION_CHECKER_MODULE, CHECK_VALID_CONNECTION_SQL,
+                        VALIDATE_ON_MATCH, BACKGROUNDVALIDATION, BACKGROUNDVALIDATIONMILLIS, USE_FAST_FAIL,
+                        STALE_CONNECTION_CHECKER_CLASSNAME, STALE_CONNECTION_CHECKER_MODULE, STALE_CONNECTION_CHECKER_PROPERTIES,
+                        EXCEPTION_SORTER_CLASSNAME, EXCEPTION_SORTER_MODULE, EXCEPTION_SORTER_PROPERTIES);
                 if (validationRequired) {
                     writer.writeStartElement(DataSource.Tag.VALIDATION.getLocalName());
                     if (dataSourceNode.hasDefined(VALID_CONNECTION_CHECKER_CLASSNAME.getName())) {
@@ -485,11 +455,8 @@ private void writeDS(XMLExtendedStreamWriter writer, boolean isXADataSource, Mod
                         }
                         writer.writeEndElement();
                     }
-                    CHECK_VALID_CONNECTION_SQL.marshallAsElement(dataSourceNode, writer);
-                    VALIDATE_ON_MATCH.marshallAsElement(dataSourceNode, writer);
-                    BACKGROUNDVALIDATION.marshallAsElement(dataSourceNode, writer);
-                    BACKGROUNDVALIDATIONMILLIS.marshallAsElement(dataSourceNode, writer);
-                    USE_FAST_FAIL.marshallAsElement(dataSourceNode, writer);
+                    marshallAsElements(dataSourceNode, writer, CHECK_VALID_CONNECTION_SQL, VALIDATE_ON_MATCH,
+                            BACKGROUNDVALIDATION, BACKGROUNDVALIDATIONMILLIS, USE_FAST_FAIL);
                     if (dataSourceNode.hasDefined(STALE_CONNECTION_CHECKER_CLASSNAME.getName())) {
                         writer.writeStartElement(Validation.Tag.STALE_CONNECTION_CHECKER.getLocalName());
                         writer.writeAttribute(org.jboss.jca.common.api.metadata.common.Extension.Attribute.CLASS_NAME.getLocalName(),
@@ -534,33 +501,16 @@ private void writeDS(XMLExtendedStreamWriter writer, boolean isXADataSource, Mod
                     }
                     writer.writeEndElement();
                 }
-                boolean timeoutRequired = BLOCKING_TIMEOUT_WAIT_MILLIS.isMarshallable(dataSourceNode) ||
-                        IDLETIMEOUTMINUTES.isMarshallable(dataSourceNode) ||
-                        SET_TX_QUERY_TIMEOUT.isMarshallable(dataSourceNode) ||
-                        QUERY_TIMEOUT.isMarshallable(dataSourceNode) ||
-                        USE_TRY_LOCK.isMarshallable(dataSourceNode) ||
-                        ALLOCATION_RETRY.isMarshallable(dataSourceNode) ||
-                        ALLOCATION_RETRY_WAIT_MILLIS.isMarshallable(dataSourceNode) ||
-                        XA_RESOURCE_TIMEOUT.isMarshallable(dataSourceNode);
+                boolean timeoutRequired = isAnyRequired(dataSourceNode, TIMEOUT_ATTRIBUTES);
                 if (timeoutRequired) {
                     writer.writeStartElement(DataSource.Tag.TIMEOUT.getLocalName());
-                    SET_TX_QUERY_TIMEOUT.marshallAsElement(dataSourceNode, writer);
-                    BLOCKING_TIMEOUT_WAIT_MILLIS.marshallAsElement(dataSourceNode, writer);
-                    IDLETIMEOUTMINUTES.marshallAsElement(dataSourceNode, writer);
-                    QUERY_TIMEOUT.marshallAsElement(dataSourceNode, writer);
-                    USE_TRY_LOCK.marshallAsElement(dataSourceNode, writer);
-                    ALLOCATION_RETRY.marshallAsElement(dataSourceNode, writer);
-                    ALLOCATION_RETRY_WAIT_MILLIS.marshallAsElement(dataSourceNode, writer);
-                    XA_RESOURCE_TIMEOUT.marshallAsElement(dataSourceNode, writer);
+                    marshallAsElements(dataSourceNode, writer, TIMEOUT_ATTRIBUTES);
                     writer.writeEndElement();
                 }
-                boolean statementRequired = hasAnyOf(dataSourceNode, TRACK_STATEMENTS, PREPARED_STATEMENTS_CACHE_SIZE, SHARE_PREPARED_STATEMENTS);
+                boolean statementRequired = hasAnyOf(dataSourceNode, STATEMENT_ATTRIBUTES);
                 if (statementRequired) {
                     writer.writeStartElement(DataSource.Tag.STATEMENT.getLocalName());
-                    TRACK_STATEMENTS.marshallAsElement(dataSourceNode, writer);
-                    PREPARED_STATEMENTS_CACHE_SIZE.marshallAsElement(dataSourceNode, writer);
-                    SHARE_PREPARED_STATEMENTS.marshallAsElement(dataSourceNode, writer);
-
+                    marshallAsElements(dataSourceNode, writer, STATEMENT_ATTRIBUTES);
                     writer.writeEndElement();
                 }
 
@@ -601,6 +551,11 @@ private void writeElementIfHas(XMLExtendedStreamWriter writer, ModelNode node, S
             }
         }
 
+        private void marshallAsElements(ModelNode node, XMLExtendedStreamWriter writer, SimpleAttributeDefinition... names) throws XMLStreamException {
+            for (SimpleAttributeDefinition attr : names) {
+                attr.marshallAsElement(node, writer);
+            }
+        }
 
         private boolean hasAnyOf(ModelNode node, SimpleAttributeDefinition... names) {
             for (SimpleAttributeDefinition current : names) {
@@ -615,6 +570,10 @@ private boolean has(ModelNode node, String name) {
             return node.has(name) && node.get(name).isDefined();
         }
 
+        private boolean isAnyRequired(ModelNode node, AttributeDefinition... names) {
+            return Arrays.stream(names).anyMatch(name -> name.isMarshallable(node));
+        };
+
         @Override
         public void readElement(final XMLExtendedStreamReader reader, final List<ModelNode> list) throws XMLStreamException {
 
diff --git a/connector/src/main/resources/schema/wildfly-datasources_7_2.xsd b/connector/src/main/resources/schema/wildfly-datasources_7_2.xsd
index 9285f0f9819e..036ab999f7a4 100644
--- a/connector/src/main/resources/schema/wildfly-datasources_7_2.xsd
+++ b/connector/src/main/resources/schema/wildfly-datasources_7_2.xsd
@@ -41,10 +41,10 @@
           </xs:annotation>
         </xs:element>
       </xs:choice>
-      <xs:element name="drivers" type="driversType" maxOccurs="1" minOccurs="0"></xs:element>
+      <xs:element name="drivers" type="driversType" maxOccurs="1" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
-  <xs:complexType name="datasourceType" mixed="false">
+  <xs:complexType name="datasourceType">
     <xs:sequence>
       <xs:element name="connection-url" type="xs:token">
         <xs:annotation>
@@ -86,56 +86,7 @@
           </xs:documentation>
         </xs:annotation>
       </xs:element>
-      <xs:element name="driver" type="xs:token" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-                An unique reference to the classloader module which contains the JDBC driver
-                The accepted format is driverName#majorVersion.minorVersion
-               ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="url-delimiter" type="xs:token" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specifies the delimeter for URLs in connection-url for HA datasources
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="url-selector-strategy-class-name" type="xs:token" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="new-connection-sql" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specify an SQL statement to execute whenever a connection is added
-              to the connection pool.
-              ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="transaction-isolation" type="transaction-isolationType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Set java.sql.Connection transaction isolation level to use. The constants
-              defined by transaction-isolation-values are the possible transaction isolation
-              levels and include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED
-              TRANSACTION_REPEATABLE_READ TRANSACTION_SERIALIZABLE TRANSACTION_NONE
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
+      <xs:group ref="common-simpleDatasourceElements"/>
       <xs:element name="pool" type="poolType" minOccurs="0" maxOccurs="1">
         <xs:annotation>
           <xs:documentation>
@@ -145,42 +96,7 @@
           </xs:documentation>
         </xs:annotation>
       </xs:element>
-      <xs:element name="security" type="dsSecurityType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specifies the security settings
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="validation" type="validationType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specifies the validation settings
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="timeout" type="timeoutType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specifies the time out settings
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="statement" type="statementType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specifies the statement settings
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
+      <xs:group ref="common-complexDatasourceElements"/>
     </xs:sequence>
     <xs:attribute name="jta" type="xs:boolean" default="true" use="optional">
       <xs:annotation>
@@ -191,11 +107,11 @@
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attributeGroup ref="common-datasourceAttributes" />
+    <xs:attributeGroup ref="common-datasourceAttributes"/>
   </xs:complexType>
   <xs:complexType name="xa-datasourceType">
     <xs:sequence>
-      <xs:element name="xa-datasource-property" type="xa-datasource-propertyType" minOccurs="1" maxOccurs="unbounded">
+      <xs:element name="xa-datasource-property" type="config-propertyType" minOccurs="1" maxOccurs="unbounded">
         <xs:annotation>
           <xs:documentation>
             <![CDATA[[
@@ -234,56 +150,7 @@
           </xs:documentation>
         </xs:annotation>
       </xs:element>
-      <xs:element name="driver" type="xs:token" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-                An unique reference to the classloader module which contains the JDBC driver
-                The accepted format is driverName#majorVersion.minorVersion
-               ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="url-delimiter" type="xs:token" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specifies the delimeter for URLs in connection-url for HA datasources
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="url-selector-strategy-class-name" type="xs:token" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="new-connection-sql" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specify an SQL statement to execute whenever a connection is added
-              to the connection pool.
-              ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="transaction-isolation" type="transaction-isolationType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Set java.sql.Connection transaction isolation level to use. The constants
-              defined by transaction-isolation-values are the possible transaction isolation
-              levels and include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED
-              TRANSACTION_REPEATABLE_READ TRANSACTION_SERIALIZABLE TRANSACTION_NONE
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
+      <xs:group ref="common-simpleDatasourceElements"/>
       <xs:element name="xa-pool" type="xa-poolType" minOccurs="0" maxOccurs="1">
         <xs:annotation>
           <xs:documentation>
@@ -293,47 +160,11 @@
           </xs:documentation>
         </xs:annotation>
       </xs:element>
-      <xs:element name="recovery" type="recoverType" minOccurs="0" maxOccurs="1"></xs:element>
-      <xs:element name="security" type="dsSecurityType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specifies the security settings
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="validation" type="validationType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specifies the validation settings
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="timeout" type="timeoutType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specifies the time out settings
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="statement" type="statementType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>
-            <![CDATA[[
-              Specifies the statement settings
-             ]]>
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
+      <xs:element name="recovery" type="recoverType" minOccurs="0" maxOccurs="1"/>
+      <xs:group ref="common-complexDatasourceElements"/>
     </xs:sequence>
-    <xs:attributeGroup ref="common-datasourceAttributes" />
+    <xs:attributeGroup ref="common-datasourceAttributes"/>
   </xs:complexType>
-  <xs:complexType name="boolean-presenceType" />
   <xs:attributeGroup name="common-datasourceAttributes">
     <xs:attribute name="jndi-name" type="xs:token" use="required">
       <xs:annotation>
@@ -439,6 +270,103 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
+
+  <xs:group name="common-simpleDatasourceElements">
+    <xs:sequence>
+      <xs:element name="driver" type="xs:token" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>
+            <![CDATA[[
+                An unique reference to the classloader module which contains the JDBC driver
+                The accepted format is driverName#majorVersion.minorVersion
+               ]]>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url-delimiter" type="xs:token" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>
+            <![CDATA[[
+              Specifies the delimeter for URLs in connection-url for HA datasources
+             ]]>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url-selector-strategy-class-name" type="xs:token" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>
+            <![CDATA[[
+              A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy
+             ]]>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="new-connection-sql" type="xs:string" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>
+            <![CDATA[[
+              Specify an SQL statement to execute whenever a connection is added
+              to the connection pool.
+              ]]>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="transaction-isolation" type="transaction-isolationType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>
+            <![CDATA[[
+              Set java.sql.Connection transaction isolation level to use. The constants
+              defined by transaction-isolation-values are the possible transaction isolation
+              levels and include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED
+              TRANSACTION_REPEATABLE_READ TRANSACTION_SERIALIZABLE TRANSACTION_NONE
+             ]]>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:group name="common-complexDatasourceElements">
+    <xs:sequence>
+      <xs:element name="security" type="dsSecurityType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>
+            <![CDATA[[
+              Specifies the security settings
+             ]]>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="validation" type="validationType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>
+            <![CDATA[[
+              Specifies the validation settings
+             ]]>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="timeout" type="timeoutType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>
+            <![CDATA[[
+              Specifies the time out settings
+             ]]>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="statement" type="statementType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>
+            <![CDATA[[
+              Specifies the statement settings
+             ]]>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+  </xs:group>
+
   <xs:simpleType name="transaction-isolationType">
     <xs:annotation>
       <xs:documentation>
@@ -450,19 +378,13 @@
       </xs:documentation>
     </xs:annotation>
     <xs:restriction base="xs:token">
-      <xs:enumeration value="TRANSACTION_READ_UNCOMMITTED" />
-      <xs:enumeration value="TRANSACTION_READ_COMMITTED" />
-      <xs:enumeration value="TRANSACTION_REPEATABLE_READ" />
-      <xs:enumeration value="TRANSACTION_SERIALIZABLE" />
-      <xs:enumeration value="TRANSACTION_NONE" />
+      <xs:enumeration value="TRANSACTION_READ_UNCOMMITTED"/>
+      <xs:enumeration value="TRANSACTION_READ_COMMITTED"/>
+      <xs:enumeration value="TRANSACTION_REPEATABLE_READ"/>
+      <xs:enumeration value="TRANSACTION_SERIALIZABLE"/>
+      <xs:enumeration value="TRANSACTION_NONE"/>
     </xs:restriction>
   </xs:simpleType>
-  <xs:complexType name="xa-datasource-propertyType" mixed="true">
-    <xs:attribute name="name" use="required" type="xs:token" />
-  </xs:complexType>
-  <xs:complexType name="connection-propertyType" mixed="true">
-    <xs:attribute name="name" use="required" type="xs:token" />
-  </xs:complexType>
   <xs:complexType name="validationType">
     <xs:sequence>
       <xs:element name="valid-connection-checker" type="moduleExtensionType" minOccurs="0">
@@ -652,9 +574,9 @@
   </xs:complexType>
   <xs:simpleType name="track-statementsType">
     <xs:restriction base="xs:token">
-      <xs:enumeration value="true" />
-      <xs:enumeration value="false" />
-      <xs:enumeration value="nowarn" />
+      <xs:enumeration value="true"/>
+      <xs:enumeration value="false"/>
+      <xs:enumeration value="nowarn"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:complexType name="statementType">
@@ -885,9 +807,9 @@
           </xs:annotation>
         </xs:element>
         <xs:element name="authentication-context" type="xs:token" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>
-                <![CDATA[[
+          <xs:annotation>
+            <xs:documentation>
+              <![CDATA[[
                 Indicates the Elytron context that will be used for authenticating connections during
                 container-managed sign-on.
                 The resulting Subject will be used to distinguish connections in the pool.
@@ -897,9 +819,9 @@
                   <elytron-enabled/>
                   <authentication-context>HsqlDbContext</authentication-context>
                 ]]>
-              </xs:documentation>
-            </xs:annotation>
-          </xs:element>
+            </xs:documentation>
+          </xs:annotation>
+        </xs:element>
       </xs:choice>
       <xs:element name="credential-reference" type="credential-reference:credentialReferenceType" minOccurs="0">
         <xs:annotation>
@@ -922,7 +844,7 @@
           </xs:documentation>
         </xs:annotation>
       </xs:element>
-      <xs:element name="reauth-plugin" type="extensionType" minOccurs="0" maxOccurs="1" />
+      <xs:element name="reauth-plugin" type="extensionType" minOccurs="0" maxOccurs="1"/>
     </xs:sequence>
     <xs:attribute name="user-name" type="xs:token" use="optional">
       <xs:annotation>
@@ -946,38 +868,23 @@
 
   <xs:complexType name="extensionType">
     <xs:sequence>
-      <xs:element name="config-property" type="config-propertyType" minOccurs="0" maxOccurs="unbounded"></xs:element>
+      <xs:element name="config-property" type="config-propertyType" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
-    <xs:attribute name="class-name" type="xs:token" use="required"></xs:attribute>
+    <xs:attribute name="class-name" type="xs:token" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="moduleExtensionType">
-    <xs:sequence>
-      <xs:element name="config-property" type="config-propertyType" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-    <xs:attribute name="class-name" type="xs:token" use="required"></xs:attribute>
-    <xs:attribute name="module" type="xs:token" use="optional"></xs:attribute>
+    <xs:complexContent>
+      <xs:extension base="extensionType">
+        <xs:attribute name="module" type="xs:token" use="optional"/>
+      </xs:extension>
+    </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="config-propertyType" mixed="true">
-    <xs:annotation>
-      <xs:documentation>
-        <![CDATA[[
-          Specifies a Java bean property value
-         ]]>
-      </xs:documentation>
-    </xs:annotation>
     <xs:simpleContent>
       <xs:extension base="xs:token">
-        <xs:attribute use="required" name="name" type="xs:token">
-          <xs:annotation>
-            <xs:documentation>
-              <![CDATA[[
-                Specifies the name of the config-property
-               ]]>
-            </xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
+        <xs:attribute use="required" name="name" type="xs:token"/>
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
@@ -1090,7 +997,7 @@
 
   <xs:complexType name="driversType">
     <xs:sequence>
-      <xs:element name="driver" type="driverType" maxOccurs="unbounded" minOccurs="1"></xs:element>
+      <xs:element name="driver" type="driverType" maxOccurs="unbounded" minOccurs="1"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="capacityType">