diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsd b/src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsd
index 71178b7a..b5f74921 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsd
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsd
@@ -2,56 +2,49 @@
 <xsd:schema xmlns="http://www.springframework.net" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense" targetNamespace="http://www.springframework.net" elementFormDefault="qualified" attributeFormDefault="unqualified" vs:friendlyname="Spring.NET Configuration" vs:ishtmlschema="false" vs:iscasesensitive="true" vs:requireattributequotes="true" vs:defaultnamespacequalifier="" vs:defaultnsprefix="">
     <xsd:annotation>
         <xsd:documentation>
+            <![CDATA[
             Spring Objects XML Schema Definition
             Based on Spring Beans DTD, authored by Rod Johnson &amp; Juergen Hoeller
-            
+
             Author: Griffin Caprio
-            
+
             This defines a simple and consistent way of creating a namespace
             of managed objects configured by a Spring XmlObjectFactory.
             This document type is used by most Spring functionality, including
             web application contexts, which are based on object factories.
-            
+
             Each object element in this document defines an object.
             Typically the object type (System.Type is specified, along with plain vanilla
             object properties.
-            
+
             Object instances can be "singletons" (shared instances) or "prototypes"
             (independent instances).
-            
+
             References among objects are supported, i.e. setting an object property
             to refer to another object in the same factory or an ancestor factory.
-            
+
             As alternative to object references, "inner object definitions" can be used.
             Singleton flags and names of such "inner object" are always ignored:
             Inner object are anonymous prototypes.
-            
-            There is also support for lists, dictionaries, and sets.
-        </xsd:documentation>
-    </xsd:annotation>
-  
-  <!-- base types -->
-  <xsd:complexType name="identifiedType" abstract="true">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[
-	The unique identifier for a bean. The scope of the identifier
-	is the enclosing object factory.
-			]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="id" type="xsd:ID">
-      <xsd:annotation>
-        <xsd:documentation>
-          <![CDATA[
-	The unique identifier for an object.
-				]]>
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-  </xsd:complexType>
 
-  <xsd:annotation>
+            There is also support for lists, dictionaries, and sets.
+            ]]>
+        </xsd:documentation>
+    </xsd:annotation>
+
+    <!-- base types -->
+    <xsd:complexType name="identifiedType" abstract="true">
+        <xsd:annotation>
+            <xsd:documentation><![CDATA[The unique identifier for a bean. The scope of the identifier is the enclosing object factory.]]></xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="id" type="xsd:ID">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[The unique identifier for an object.]]></xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:annotation>
         <xsd:documentation>Defines a base type for any required string.  Defines a string with a minimum length of 0</xsd:documentation>
     </xsd:annotation>
     <xsd:simpleType name="nonNullString">
@@ -77,10 +70,10 @@
         </xsd:simpleContent>
     </xsd:complexType>
     <xsd:complexType name="expression">
-      <xsd:sequence>
-        <xsd:element name="property" type="property" minOccurs="0" maxOccurs="2"/>
-      </xsd:sequence>
-      <xsd:attribute name="value" type="nonNullString" use="required"/>
+        <xsd:sequence>
+            <xsd:element name="property" type="property" minOccurs="0" maxOccurs="2"/>
+        </xsd:sequence>
+        <xsd:attribute name="value" type="nonNullString" use="required"/>
     </xsd:complexType>
     <!--
          Defines a reference to another object in this factory or an external
@@ -179,14 +172,14 @@
                      will resolve to an empty String, which will not be resolved to a
                      null value unless a special TypeConverter does so.
                 -->
-        <xsd:element name="null" />
-        <xsd:any namespace="##other" processContents="strict" />
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:group>
-  <xsd:complexType name="objectNameValues">
-    <xsd:sequence>
-      <!--
+                <xsd:element name="null" />
+                <xsd:any namespace="##other" processContents="strict" />
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:group>
+    <xsd:complexType name="objectNameValues">
+        <xsd:sequence>
+            <!--
                  The "value" attribute is the string value of the property. The "key"
                  attribute is the name of the property.
             -->
@@ -247,7 +240,7 @@
               to avoid ambiguities, e.g. in case of 2 arguments of the same type.
         -->
         <xsd:attribute name="index" type="nonNullString" use="optional"/>
-       <!--
+        <!--
               The constructor-arg tag can have an optional type attribute,
               to specify the exact type of the constructor argument. Only needed
               to avoid ambiguities, e.g. in case of 2 single argument constructors
@@ -297,9 +290,9 @@
                 <xsd:complexType>
                     <xsd:sequence>
                         <xsd:element name="arg-type" minOccurs="0" maxOccurs="unbounded">
-                             <xsd:complexType>
-                                  <xsd:attribute name="match" type="nonNullString" use="required"/>
-                             </xsd:complexType>
+                            <xsd:complexType>
+                                <xsd:attribute name="match" type="nonNullString" use="required"/>
+                            </xsd:complexType>
                         </xsd:element>
                     </xsd:sequence>
                     <xsd:attribute name="name" type="nonNullString" use="required"/>
@@ -497,7 +490,7 @@
         <xsd:attribute name="factory-method" type="nonNullString" use="optional"/>
         <xsd:attribute name="factory-object" type="nonNullString" use="optional"/>
     </xsd:complexType>
-    
+
     <xsd:annotation>
         <xsd:documentation>The document root.  At least one object definition is required.</xsd:documentation>
     </xsd:annotation>
@@ -540,5 +533,5 @@
             </xsd:attribute>
         </xsd:complexType>
     </xsd:element>
-    
+
 </xsd:schema>
diff --git a/src/Spring/Spring.Core/Validation/Config/spring-validation-1.1.xsd b/src/Spring/Spring.Core/Validation/Config/spring-validation-1.1.xsd
index 0290b8b5..b89886f2 100644
--- a/src/Spring/Spring.Core/Validation/Config/spring-validation-1.1.xsd
+++ b/src/Spring/Spring.Core/Validation/Config/spring-validation-1.1.xsd
@@ -1,160 +1,159 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xs:schema xmlns="http://www.springframework.net/validation"
-          xmlns:objects="http://www.springframework.net" 
-          xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-          xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense" 
-          targetNamespace="http://www.springframework.net/validation" 
-          elementFormDefault="qualified" attributeFormDefault="unqualified" 
+          xmlns:objects="http://www.springframework.net"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense"
+          targetNamespace="http://www.springframework.net/validation"
+          elementFormDefault="qualified" attributeFormDefault="unqualified"
           vs:friendlyname="Spring.NET Validation Framework Configuration" vs:ishtmlschema="false" vs:iscasesensitive="true" vs:requireattributequotes="true" vs:defaultnamespacequalifier="" vs:defaultnsprefix="">
 
-  <xs:import namespace="http://www.springframework.net"/>
+    <xs:import namespace="http://www.springframework.net"/>
 
-  <xs:annotation>
-    <xs:documentation>
-      Spring.NET Validation Framework Config Schema Definition
-
-      Author: Aleksandar Seovic
-
-      This file defines a configuration schema for the validation framework
-      object definitions. Using elements from this schema instead of the
-      standard object definitions can greatly simplify validator configuration.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType name="messageType">
     <xs:annotation>
-      <xs:documentation>Defines a message type.</xs:documentation>
+        <xs:documentation>
+            <![CDATA[
+            Spring.NET Validation Framework Config Schema Definition
+
+            Author: Aleksandar Seovic
+
+            This file defines a configuration schema for the validation framework
+            object definitions. Using elements from this schema instead of the
+            standard object definitions can greatly simplify validator configuration.
+            ]]>
+        </xs:documentation>
     </xs:annotation>
-    <xs:sequence>
-      <xs:element name="param" type="messageParamType" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="id" type="objects:nonNullString" use="required"/>
-    <xs:attribute name="providers" type="objects:nonNullString" use="required"/>
-    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
-  </xs:complexType>
 
-  <xs:complexType name="messageParamType">
-    <xs:annotation>
-      <xs:documentation>Defines a message parameter type.</xs:documentation>
-    </xs:annotation>
-    <xs:attribute name="value" type="objects:nonNullString" use="optional"/>
-  </xs:complexType>
+    <xs:complexType name="messageType">
+        <xs:annotation>
+            <xs:documentation>Defines a message type.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="param" type="messageParamType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="objects:nonNullString" use="required"/>
+        <xs:attribute name="providers" type="objects:nonNullString" use="required"/>
+        <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+    </xs:complexType>
 
-  <xs:complexType name="actionType">
-    <xs:annotation>
-      <xs:documentation>Defines an action type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="property" type="objects:property" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="type" type="objects:nonNullString" use="required"/>
-    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
-  </xs:complexType>
+    <xs:complexType name="messageParamType">
+        <xs:annotation>
+            <xs:documentation>Defines a message parameter type.</xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="value" type="objects:nonNullString" use="optional"/>
+    </xs:complexType>
 
-  <xs:complexType name="referenceType">
-    <xs:annotation>
-      <xs:documentation>Defines a validator reference type.</xs:documentation>
-    </xs:annotation>
-    <xs:attribute name="name" type="objects:nonNullString" use="required"/>
-    <xs:attribute name="context" type="objects:nonNullString" use="optional"/>
-  </xs:complexType>
+    <xs:complexType name="actionType">
+        <xs:annotation>
+            <xs:documentation>Defines an action type.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="property" type="objects:property" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="type" type="objects:nonNullString" use="required"/>
+        <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+    </xs:complexType>
 
-  <xs:complexType name="baseValidatorType">
-    <xs:annotation>
-      <xs:documentation>Defines base validator type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="message" type="messageType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="action" type="actionType" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="id" type="xs:ID" use="optional"/>
-    <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
-    <xs:attribute name="test" type="objects:nonNullString" use="required"/>
-    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
-  </xs:complexType>
+    <xs:complexType name="referenceType">
+        <xs:annotation>
+            <xs:documentation>Defines a validator reference type.</xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="name" type="objects:nonNullString" use="required"/>
+        <xs:attribute name="context" type="objects:nonNullString" use="optional"/>
+    </xs:complexType>
 
-  <xs:complexType name="genericValidatorType">
-    <xs:annotation>
-      <xs:documentation>Defines a generic validator type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>     
-      <xs:element name="property" type="objects:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="message" type="messageType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="action" type="actionType" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="id" type="xs:ID" use="optional"/>
-    <xs:attribute name="type" type="objects:nonNullString" use="required"/>
-    <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
-    <xs:attribute name="test" type="objects:nonNullString" use="optional"/>
-    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
-  </xs:complexType>
+    <xs:complexType name="baseValidatorType">
+        <xs:annotation>
+            <xs:documentation>Defines base validator type.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="message" type="messageType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="action" type="actionType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:ID" use="optional"/>
+        <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
+        <xs:attribute name="test" type="objects:nonNullString" use="required"/>
+        <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+    </xs:complexType>
 
-  <xs:complexType name="regexValidatorType">
-    <xs:annotation>
-      <xs:documentation>Defines a regex validator type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="property" type="objects:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="message" type="messageType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="action" type="actionType" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="id" type="xs:ID" use="optional"/>
-    <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
-    <xs:attribute name="test" type="objects:nonNullString" use="required"/>
-    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
-  </xs:complexType>
+    <xs:complexType name="genericValidatorType">
+        <xs:annotation>
+            <xs:documentation>Defines a generic validator type.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="property" type="objects:property" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="message" type="messageType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="action" type="actionType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:ID" use="optional"/>
+        <xs:attribute name="type" type="objects:nonNullString" use="required"/>
+        <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
+        <xs:attribute name="test" type="objects:nonNullString" use="optional"/>
+        <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+    </xs:complexType>
 
-  <xs:complexType name="validatorGroupType">
-    <xs:annotation>
-      <xs:documentation>Defines a validator group type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence minOccurs="1" maxOccurs="unbounded">
-      <xs:choice>
-        <xs:element name="message" type="messageType"/>
-        <xs:element name="action" type="actionType"/>
+    <xs:complexType name="regexValidatorType">
+        <xs:annotation>
+            <xs:documentation>Defines a regex validator type.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="property" type="objects:property" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="message" type="messageType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="action" type="actionType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:ID" use="optional"/>
+        <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
+        <xs:attribute name="test" type="objects:nonNullString" use="required"/>
+        <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+    </xs:complexType>
 
-        <xs:element name="group" type="validatorGroupType"/>
-        <xs:element name="any" type="validatorGroupType"/>
-        <xs:element name="exclusive" type="validatorGroupType"/>
+    <xs:complexType name="validatorGroupType">
+        <xs:annotation>
+            <xs:documentation>Defines a validator group type.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+            <xs:choice>
+                <xs:element name="message" type="messageType"/>
+                <xs:element name="action" type="actionType"/>
 
-        <xs:element name="validator" type="genericValidatorType"/>
-        <xs:element name="required" type="baseValidatorType"/>
-        <xs:element name="condition" type="baseValidatorType"/>
-        <xs:element name="regex" type="regexValidatorType"/>
-        <xs:element name="ref" type="referenceType"/>
+                <xs:element name="group" type="validatorGroupType"/>
+                <xs:element name="any" type="validatorGroupType"/>
+                <xs:element name="exclusive" type="validatorGroupType"/>
 
-        <xs:element name="collection" type="collectionValidatorGroupType"/>        
-      </xs:choice>
-    </xs:sequence>
-    <xs:attribute name="id" type="xs:ID" use="optional"/>
-    <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
-    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
-  </xs:complexType>
+                <xs:element name="validator" type="genericValidatorType"/>
+                <xs:element name="required" type="baseValidatorType"/>
+                <xs:element name="condition" type="baseValidatorType"/>
+                <xs:element name="regex" type="regexValidatorType"/>
+                <xs:element name="ref" type="referenceType"/>
 
-  <xs:complexType name="collectionValidatorGroupType">
-    <xs:annotation>
-      <xs:documentation>Defines a collection validator group type.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>      
-      <xs:extension base="validatorGroupType">        
-        <xs:attribute name="validate-all" type="xs:boolean" use="optional" default="false"/>
-        <xs:attribute name="include-element-errors" type="xs:boolean" use="optional" default="false"/>
-        <xs:attribute name="context" type="objects:nonNullString" use="optional"/>        
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+                <xs:element name="collection" type="collectionValidatorGroupType"/>
+            </xs:choice>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:ID" use="optional"/>
+        <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
+        <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+    </xs:complexType>
 
-  <xs:element name="validator" type="genericValidatorType"/>
-  <xs:element name="required" type="baseValidatorType"/>
-  <xs:element name="condition" type="baseValidatorType"/>
-  <xs:element name="regex" type="regexValidatorType"/>
+    <xs:complexType name="collectionValidatorGroupType">
+        <xs:annotation>
+            <xs:documentation>Defines a collection validator group type.</xs:documentation>
+        </xs:annotation>
+        <xs:complexContent>
+            <xs:extension base="validatorGroupType">
+                <xs:attribute name="validate-all" type="xs:boolean" use="optional" default="false"/>
+                <xs:attribute name="include-element-errors" type="xs:boolean" use="optional" default="false"/>
+                <xs:attribute name="context" type="objects:nonNullString" use="optional"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
 
-  <xs:element name="group" type="validatorGroupType"/>
-  <xs:element name="any" type="validatorGroupType"/>
-  <xs:element name="exclusive" type="validatorGroupType"/>
-
-  <xs:element name="collection" type="collectionValidatorGroupType"/>
-    
+    <xs:element name="validator" type="genericValidatorType"/>
+    <xs:element name="required" type="baseValidatorType"/>
+    <xs:element name="condition" type="baseValidatorType"/>
+    <xs:element name="regex" type="regexValidatorType"/>
 
+    <xs:element name="group" type="validatorGroupType"/>
+    <xs:element name="any" type="validatorGroupType"/>
+    <xs:element name="exclusive" type="validatorGroupType"/>
+    <xs:element name="collection" type="collectionValidatorGroupType"/>
 
 </xs:schema>