diff --git a/xml/resources.rng b/xml/resources.rng
index ec26d03a99..8531a6da44 100644
--- a/xml/resources.rng
+++ b/xml/resources.rng
@@ -1,147 +1,159 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-resources"/>
   </start>
 
   <define name="element-resources">
       <zeroOrMore>
 	<choice>
 	  <ref name="element-primitive"/>
 	  <ref name="element-group"/>
 	  <ref name="element-clone"/>
 	  <ref name="element-master"/>
 	</choice>
       </zeroOrMore>
   </define>
 
   <define name="element-primitive">
     <element name="primitive">
-      <attribute name="id"><data type="ID"/></attribute>
-      <choice>
-	<group>
-	  <attribute name="class"><value>ocf</value></attribute>
-	  <attribute name="provider"><text/></attribute>
-	</group>
-	<attribute name="class">
-	  <choice>
-	    <value>lsb</value>
-	    <value>heartbeat</value>
-	    <value>stonith</value>
-	  </choice>
-	</attribute>
-      </choice>
-      <attribute name="type"><text/></attribute>
-      <optional>
-	<attribute name="description"><text/></attribute>
-      </optional>
       <interleave>
+	<attribute name="id"><data type="ID"/></attribute>
+	<choice>
+	  <group>
+	    <attribute name="class"><value>ocf</value></attribute>
+	    <attribute name="provider"><text/></attribute>
+	  </group>
+	  <attribute name="class">
+	    <choice>
+	      <value>lsb</value>
+	      <value>heartbeat</value>
+	      <value>stonith</value>
+	    </choice>
+	  </attribute>
+	</choice>
+	<attribute name="type"><text/></attribute>
+	<optional>
+	  <attribute name="description"><text/></attribute>
+	</optional>
 	<ref name="element-resource-extra"/>
 	<ref name="element-operations"/>
       </interleave>
     </element>
   </define>
 
   <define name="element-group">
     <element name="group">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
 	<attribute name="description"><text/></attribute>
       </optional>
       <interleave>
 	<ref name="element-resource-extra"/>
 	<oneOrMore>
 	  <ref name="element-primitive"/>
 	</oneOrMore>
       </interleave>
     </element>
   </define>
  
   <define name="element-clone">
     <element name="clone">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
 	<attribute name="description"><text/></attribute>
       </optional>
       <interleave>
 	<ref name="element-resource-extra"/>
 	<choice>
 	  <ref name="element-primitive"/>
 	  <ref name="element-group"/>
 	</choice>
       </interleave>
     </element>
   </define>
 
   <define name="element-master">
     <element name="master">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
 	<attribute name="description"><text/></attribute>
       </optional>
       <interleave>
 	<ref name="element-resource-extra"/>
 	<choice>
 	  <ref name="element-primitive"/>
 	  <ref name="element-group"/>
 	</choice>
       </interleave>
     </element>
   </define>
 
   <define name="element-resource-extra">
     <optional>
       <element name="meta_attributes">
 	<externalRef href="nvset.rng"/>
       </element>
     </optional>
     <optional>
       <element name="instance_attributes">
 	<externalRef href="nvset.rng"/>
       </element>
     </optional>
   </define>
  
   <define name="element-operations">
     <optional>
       <element name="operations">
 	<zeroOrMore>
 	  <element name="op">
 	    <attribute name="id"><data type="ID"/></attribute>
-	    <attribute name="description"><text/></attribute>
 	    <attribute name="name"><text/></attribute>
-	    <attribute name="interval"><data type="integer"/></attribute>
-	    <attribute name="timeout"><data type="integer"/></attribute>
-	    <attribute name="enabled"><data type="boolean"/></attribute>
-	    <attribute name="role">
-	      <choice>
-		<value>Started</value>
-		<value>Slave</value>
-		<value>Master</value>
-	      </choice>
-	    </attribute>
-	    <attribute name="requires">
-	      <choice>
-		<value>nothing</value>
-		<value>quorum</value>
-		<value>fencing</value>
-	      </choice>
-	    </attribute>
-	    <attribute name="on-fail">
-	      <choice>
-		<value>ignore</value>
-		<value>block</value>
-		<value>stop</value>
-		<value>restart</value>
-		<value>fence</value>
-	      </choice>
-	    </attribute>
+	    <attribute name="interval"><text/></attribute>
+	    <optional>
+	      <attribute name="description"><text/></attribute>
+	    </optional>
+	    <optional>
+	      <attribute name="timeout"><text/></attribute>
+	    </optional>
+	    <optional>
+	      <attribute name="enabled"><data type="boolean"/></attribute>
+	    </optional>
+	    <optional>
+	      <attribute name="role">
+		<choice>
+		  <value>Started</value>
+		  <value>Slave</value>
+		  <value>Master</value>
+		</choice>
+	      </attribute>
+	    </optional>
+	    <optional>
+	      <attribute name="requires">
+		<choice>
+		  <value>nothing</value>
+		  <value>quorum</value>
+		  <value>fencing</value>
+		</choice>
+	      </attribute>
+	    </optional>
+	    <optional>
+	      <attribute name="on-fail">
+		<choice>
+		  <value>ignore</value>
+		  <value>block</value>
+		  <value>stop</value>
+		  <value>restart</value>
+		  <value>fence</value>
+		</choice>
+	      </attribute>
+	    </optional>
 	    <ref name="element-resource-extra"/>
 	  </element>
 	</zeroOrMore>
       </element>
     </optional>
   </define>
 
 </grammar>