--- a/2.0/core/schema/rng/xforms-nons-20.rnc	Thu May 24 16:52:03 2012 +0200
+++ b/2.0/core/schema/rng/xforms-nons-20.rnc	Thu May 31 09:49:13 2012 +0200
@@ -20,7 +20,8 @@
 xforms.Common.attrib =
   # host language to add common attributes here
   attribute id { xsd:ID }?,
-  attribute context { XPathExpression }?
+  attribute context { XPathExpression }?,
+  attribute model { xsd:IDREF }?
 xforms.Events.attrib =
   # host language to add XML Events attributes here
   empty
@@ -28,11 +29,9 @@
   # host language to add src attribute here
   empty
 xforms.Single.Node.Binding.attrib =
-  attribute model { xsd:IDREF }?,
   attribute ref { XPathExpression }?,
   attribute bind { IDREF-avt }?
 xforms.Sequence.Binding.attrib =
-  attribute model { xsd:IDREF }?,
   attribute ref { XPathExpression }?,
   attribute nodeset { XPathExpression }?, # nodeset is deprecated; use ref
   attribute bind { IDREF-avt }?
@@ -158,7 +157,6 @@
    xforms.Common.attrib,
    attribute name { xsd:QName },
    attribute value { XPathExpression },
-   attribute model { IDREF-avt }?
 xforms.var.content = text
 # Functions
 xforms.function = element function { xforms.function.attrib, xforms.function.content }
@@ -417,7 +415,6 @@
   element rebuild { xforms.rebuild.attrib, xforms.rebuild.content }
 xforms.rebuild.attrib =
   xforms.Common.attrib,
-  attribute model { IDREF-avt }?,
   xforms.actions.attrib
 xforms.rebuild.content = empty
 xforms.revalidate =
@@ -426,7 +423,6 @@
   }
 xforms.revalidate.attrib =
   xforms.Common.attrib,
-  attribute model { IDREF-avt }?,
   xforms.actions.attrib
 xforms.revalidate.content = empty
 xforms.recalculate =
@@ -435,14 +431,12 @@
   }
 xforms.recalculate.attrib =
   xforms.Common.attrib,
-  attribute model { IDREF-avt }?,
   xforms.actions.attrib
 xforms.recalculate.content = empty
 xforms.refresh =
   element refresh { xforms.refresh.attrib, xforms.refresh.content }
 xforms.refresh.attrib =
   xforms.Common.attrib,
-  attribute model { IDREF-avt }?,
   xforms.actions.attrib
 xforms.refresh.content = empty
 xforms.setfocus =
@@ -477,7 +471,6 @@
   element reset { xforms.reset.attrib, xforms.reset.content }
 xforms.reset.attrib =
   xforms.Common.attrib,
-  attribute model { IDREF-avt }?,
   xforms.actions.attrib
 xforms.reset.content = empty
 xforms.insert =

--- a/2.0/core/schema/xsd/XForms-20-Schema.xsd	Thu May 24 16:52:03 2012 +0200
+++ b/2.0/core/schema/xsd/XForms-20-Schema.xsd	Thu May 31 09:49:13 2012 +0200
@@ -92,17 +92,16 @@
 		</xsd:annotation>
 		<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		<xsd:attribute name="context" type="xforms:XPathExpression" use="optional"/>
+		<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 		<xsd:anyAttribute namespace="##other"/>
 	</xsd:attributeGroup>
 
 	<xsd:attributeGroup name="Single.Node.Binding.Attributes">
-		<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 		<xsd:attribute name="ref" type="xforms:XPathExpression" use="optional"/>
 		<xsd:attribute name="bind" type="xsd:IDREF" use="optional"/>
 	</xsd:attributeGroup>
 
 	<xsd:attributeGroup name="Nodeset.Binding.Attributes">
-		<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 		<xsd:attribute name="nodeset" type="xforms:XPathExpression" use="optional"/>
 		<xsd:attribute name="bind" type="xsd:IDREF" use="optional"/>
 	</xsd:attributeGroup>
@@ -183,7 +182,6 @@
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attribute name="name" type="xsd:QName" use="optional"/>
 			<xsd:attribute name="value" type="xforms:XPathExpression" use="optional"/>
-			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -789,7 +787,6 @@
 	<xsd:element name="rebuild">
 		<xsd:complexType>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
 			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
@@ -797,7 +794,6 @@
 	<xsd:element name="recalculate">
 		<xsd:complexType>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
 			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
@@ -805,7 +801,6 @@
 	<xsd:element name="revalidate">
 		<xsd:complexType>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
 			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
@@ -813,7 +808,6 @@
 	<xsd:element name="refresh">
 		<xsd:complexType>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
 			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
@@ -823,7 +817,6 @@
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
 			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
-			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="load">