Index: DamEngine/trunk/xsdWork/DamTimeSerie.xsd
===================================================================
diff -u -r5874 -r5877
--- DamEngine/trunk/xsdWork/DamTimeSerie.xsd	(.../DamTimeSerie.xsd)	(revision 5874)
+++ DamEngine/trunk/xsdWork/DamTimeSerie.xsd	(.../DamTimeSerie.xsd)	(revision 5877)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
 <xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:include schemaLocation=".\Common\Point2D.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\WaternetCalculation.xsd" />
   <xs:complexType name="TimeSerie">
     <xs:sequence>
       <xs:element minOccurs="1" maxOccurs="1" name="TimeStep">
@@ -31,13 +33,7 @@
             <xs:element name="TimeSerieEntry">
               <xs:complexType>
                 <xs:sequence>
-                  <xs:element minOccurs="0" maxOccurs="1" name="StochastValue">
-                    <xs:complexType>
-                      <xs:attribute name="Mean" type="xs:double" use="required" />
-                      <xs:attribute name="StandardDeviation" type="xs:double" use="required" />
-                      <xs:attribute name="Distribution" type="xs:int" use="required" />
-                    </xs:complexType>
-                  </xs:element>
+                  <xs:element minOccurs="0" maxOccurs="1" name="Waternet" type="WaternetType" />
                 </xs:sequence>
                 <xs:attribute name="DateTime" type="xs:dateTime" use="required" />
                 <xs:attribute name="Value" type="xs:double" use="required" />
Index: DamEngine/trunk/xsdWork/DamOutput.xsd
===================================================================
diff -u -r5874 -r5877
--- DamEngine/trunk/xsdWork/DamOutput.xsd	(.../DamOutput.xsd)	(revision 5874)
+++ DamEngine/trunk/xsdWork/DamOutput.xsd	(.../DamOutput.xsd)	(revision 5877)
@@ -4,12 +4,20 @@
   <xs:include schemaLocation=".\Message.xsd" />
   <xs:include schemaLocation=".\DamCalculationResults.xsd" />
   <xs:include schemaLocation=".\DamTimeSerie.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\OperationalStaticData.xsd" />
   <xs:complexType name="Output">
     <xs:sequence>
       <xs:element name="Results">
         <xs:complexType>
           <xs:sequence>
             <xs:element name="CalculationResults" type="CalculationResults" />
+            <xs:element name="OperationalStaticData">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element minOccurs="0" maxOccurs="1" name="OperationalStaticData" type="OperationalStaticData" />
+                </xs:sequence>
+              </xs:complexType>
+            </xs:element>
             <xs:element minOccurs="0" maxOccurs="1" name="OperationalOutputTimeSeries" nillable="true">
               <xs:complexType>
                 <xs:sequence>
Index: DamEngine/trunk/xsdWork/OutputTypes/WaternetLineType.xsd
===================================================================
diff -u
--- DamEngine/trunk/xsdWork/OutputTypes/WaternetLineType.xsd	(revision 0)
+++ DamEngine/trunk/xsdWork/OutputTypes/WaternetLineType.xsd	(revision 5877)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:include schemaLocation="..\Common\Point2D.xsd" />
+  <xs:complexType name="WaternetLineType">
+    <xs:sequence>
+      <xs:element minOccurs="1" maxOccurs="1" name="Points">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="2" maxOccurs="unbounded" name="Point" type="Point2DType" />
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="Name" type="xs:string" use="optional" />
+  </xs:complexType>
+</xs:schema>
\ No newline at end of file
Index: DamEngine/trunk/xsdWork/OutputTypes/WaternetCalculation.xsd
===================================================================
diff -u -r5874 -r5877
--- DamEngine/trunk/xsdWork/OutputTypes/WaternetCalculation.xsd	(.../WaternetCalculation.xsd)	(revision 5874)
+++ DamEngine/trunk/xsdWork/OutputTypes/WaternetCalculation.xsd	(.../WaternetCalculation.xsd)	(revision 5877)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:include schemaLocation=".\Point2D.xsd" />
+  <xs:include schemaLocation="..\Common\Point2D.xsd" />
   <xs:include schemaLocation=".\WaternetLineType.xsd" />
   <xs:complexType name="HeadLineType">
     <xs:sequence>