diff --git a/SDT/schema/etc/domain.rnc b/SDT/schema/etc/domain.rnc
index 3bb4e2ea0c2df2e40bd5e94acf1dcc1508fbcf33..3e9e3f4b0969c0d7656598944a3cd71271f78938 100644
--- a/SDT/schema/etc/domain.rnc
+++ b/SDT/schema/etc/domain.rnc
@@ -83,7 +83,9 @@ Data =
 Events =
   element Events {
     element Event {
-      attribute name { text }
+      attribute name { text },
+      Data,
+      Doc
     }*
   }
 #
diff --git a/SDT/schema/src/domain.rng b/SDT/schema/src/domain.rng
index ecf4fc72d341c12be552aecc6cf5879a3acbbb8c..d43e63bf5354e0fbf0dfa4d1d2486f885a01989c 100644
--- a/SDT/schema/src/domain.rng
+++ b/SDT/schema/src/domain.rng
@@ -215,6 +215,8 @@
 	  <attribute name="name">
 	    <text/>
 	  </attribute>
+	  <ref name="Data" />
+  	  <ref name="Doc"/>
 	</element>
       </zeroOrMore>
     </element>
diff --git a/SDT/schema/src/domain.xsd b/SDT/schema/src/domain.xsd
index fe3ea3f95672c5eca712801f2bdcc3b4b8eaec27..b68c0d238b6a2c7c8e034490ea6552a885892026 100644
--- a/SDT/schema/src/domain.xsd
+++ b/SDT/schema/src/domain.xsd
@@ -182,6 +182,10 @@
   </xs:element>
   <xs:element name="Event">
     <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="Data"/>
+        <xs:group ref="Doc"/>
+      </xs:sequence>
       <xs:attribute name="name" use="required"/>
     </xs:complexType>
   </xs:element>
diff --git a/SDT/schema/test/dal-eg.xml b/SDT/schema/test/dal-eg.xml
index 81603e8d5951c2adfcdca1341ccf2cbf6ae613b8..4e170665de9686c4f89d3a0e8335b5ea616388bc 100644
--- a/SDT/schema/test/dal-eg.xml
+++ b/SDT/schema/test/dal-eg.xml
@@ -54,6 +54,17 @@
 	      </Doc>
 	    </Action>
 	  </Actions>
+
+	  <Events>
+	  	<Event name="switchEvent">
+		  <Data>
+		    <DataPoint name="state" type="boolean" writable="false">
+	 		</DataPoint>
+		  </Data>
+		  <Doc>An event that indicates the new state of the switch.
+		  </Doc>
+	  	</Event>
+	  </Events>
 	</Module>
 
 	<Module name="power">