diff --git a/spring-faces/src/main/java/org/springframework/faces/config/spring-faces-config-2.0.xsd b/spring-faces/src/main/java/org/springframework/faces/config/spring-faces-config-2.0.xsd
index 67f2996f..50f50fad 100644
--- a/spring-faces/src/main/java/org/springframework/faces/config/spring-faces-config-2.0.xsd
+++ b/spring-faces/src/main/java/org/springframework/faces/config/spring-faces-config-2.0.xsd
@@ -21,41 +21,41 @@ be used by a flow definition registry.
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="beans:identifiedType">
+					<xsd:attribute name="conversion-service">
+						<xsd:annotation>
+							<xsd:documentation>
+								<![CDATA[
+The idref of the conversion service that should be used.  If not provided, the default conversion service will be used.
+]]>
+							</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="expression-parser">
+						<xsd:annotation>
+							<xsd:documentation>
+								<![CDATA[
+The idref of the expression parser instance that should be used.  If not provided, the default OGNL expression parser 
+will be used.
+]]>
+							</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="view-factory-creator">
+						<xsd:annotation>
+							<xsd:documentation>
+								<![CDATA[
+The idref of the view factory creator that should be used.  The view factory creator is specific to the view technology
+being used.  If not provided, the default Spring MVC view factory creator  will be used.
+]]>
+							</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
 					<xsd:attribute name="enable-managed-beans" type="xsd:boolean">
 						<xsd:annotation>
 							<xsd:documentation>
 								<![CDATA[
 When this attribute is set to true, a special EL expression parser will be enabled that allows access to JSF-managed beans
 from EL expressions in flow definitions. 
-]]>
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="expression-parser" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-								<![CDATA[
-The idref of the expression parser instance that should be used.  If not provided, the default OGNL expression parser 
-will be used.
-]]>
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="view-factory-creator" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-								<![CDATA[
-The idref of the view factory creator that should be used.  The view factory creator is specific to the view technology
-being used.  If not provided, the default Spring MVC view factory creator  will be used.
-]]>
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="conversion-service" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-								<![CDATA[
-The idref of the conversion service that should be used.  If not provided, the default conversion service will be used.
 ]]>
 							</xsd:documentation>
 						</xsd:annotation>
@@ -64,18 +64,4 @@ The idref of the conversion service that should be used.  If not provided, the d
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-	
-	
-	<!-- 
-		<xsd:attribute name="enable-managed-beans" type="xsd:boolean">
-						<xsd:annotation>
-							<xsd:documentation>
-								<![CDATA[
-When this attribute is set to true, a special EL expression parser will be enabled that allows access to JSF-managed beans
-from EL expressions in flow definitions. 
-]]>
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-	 -->
 </xsd:schema>
\ No newline at end of file