--- a/_test/Resources/resources.xsd	Tue Aug 21 17:13:47 2012 +0400
+++ b/_test/Resources/resources.xsd	Thu Aug 23 17:44:31 2012 +0400
@@ -20,7 +20,8 @@
     								</complexContent>
     							</complexType></element>
     					</sequence>
-    				</complexType></element>
+    				</complexType>
+    			</element>
     		</sequence>
     	</complexType>
     </element>
@@ -32,64 +33,49 @@
     
     <complexType name="restResource">
         <sequence>
-    		<element name="get" type="tns:restOperation" minOccurs="0">
-    		</element>
-    		<element name="post" type="tns:restOperation" minOccurs="0">
-    		</element>
-    		<element name="put" type="tns:restOperation" minOccurs="0">
-    		</element>
-    		<element name="delete" type="tns:restOperation" minOccurs="0">
-    		</element>
-    		<element name="resource" type="string" maxOccurs="unbounded" minOccurs="0"></element>
+    		<element name="get" type="tns:restOperation" minOccurs="0"/>
+    		<element name="post" type="tns:restOperation" minOccurs="0"/>
+    		<element name="put" type="tns:restOperation" minOccurs="0"/>
+    		<element name="delete" type="tns:restOperation" minOccurs="0"/>
+    		<element name="resource" type="string" maxOccurs="unbounded" minOccurs="0"/>
     	</sequence>
     </complexType>
     
     <complexType name="restOperation">
     	<sequence>
-    		<element ref="tns:abstractBinding"/>
-    		<element name="parameters" type="string"></element>
-    		<element ref="tns:abstractResult"/>
+    		<element name="bind" type="tns:methodBinding"/>
+    		<element name="parameters" type="tns:transformation" minOccurs="0"/>
+    		<element name="result" type="tns:abstractResult" minOccurs="0"/>
     	</sequence>
     </complexType>
     
     <complexType name="methodBinding" >
+        <sequence>
+            <element name="var" type="tns:bindingVariable" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="text" type="string" use="required" />
+    </complexType>
+    
+    <complexType name="bindingVariable">
         <complexContent>
-            <extension base="tns:abstractBinding">
-                <attribute name="target" type="string" />
-                <attribute name="invoke" type="string" use="required" />
+            <extension base="tns:methodBinding">
+                <attribute name="name" type="string"/>
             </extension>
         </complexContent>
     </complexType>
     
+    
     <complexType name="transformation">
         <attribute name="class" type="string" />
     </complexType>
     
     <complexType name="resourceLocator">
         <sequence>
-            <element ref="tns:abstractBinding" />
+            <element name="var" type="tns:bindingVariable" minOccurs="0" maxOccurs="unbounded"/>
             <element name="template" type="string" />
         </sequence>
     </complexType>
     
-    
-    
-    
-    <!-- substitutions  -->
-    
-    <!-- abstract -->
-    <element name="abstractBinding" type="tns:abstractBinding" abstract="true"/>
-    <element name="abstractTransfomation" type="tns:abstractTransformation" />
-    <element name="abstractResult" type="tns:abstractResult" abstract="true" />
-    
-    <!-- specific -->
-    
-    <!-- bindings -->
-    <element name="bind" type="tns:methodBinding" substitutionGroup="tns:abstractBinding"/>
-    
-    <!-- transformation -->
-    
-    <!-- result handlers  -->
     <simpleType name="redirectCodes">
         <restriction base="string">
             <enumeration value="moved-permanently"/>
@@ -108,7 +94,5 @@
             </extension>
         </complexContent>
     </complexType>
-    
-    <element name="redirect" type="tns:redirectResult" substitutionGroup="tns:abstractResult" />    
 
 </schema>
\ No newline at end of file