Index: DamEngine/trunk/xsd/DamOutput.xsd
===================================================================
diff -u -r6095 -r6096
--- DamEngine/trunk/xsd/DamOutput.xsd	(.../DamOutput.xsd)	(revision 6095)
+++ DamEngine/trunk/xsd/DamOutput.xsd	(.../DamOutput.xsd)	(revision 6096)
@@ -4,12 +4,35 @@
   <xs:include schemaLocation=".\Message.xsd" />
   <xs:include schemaLocation=".\DamCalculationResults.xsd" />
   <xs:include schemaLocation=".\DamTimeSerie.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\OperationalStaticData.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\OperationalLocationsStaticData.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\TrafficLoadTypeDefinition.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="OperationalLocationsStaticData" nillable="true">
+              <xs:complexType>
+                <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                  <xs:element minOccurs="1" maxOccurs="1" name="OperationalLocationStaticData">
+                    <xs:complexType>
+                      <xs:sequence minOccurs="1" maxOccurs="1">
+                        <xs:element name="TrafficLoad" type="TrafficLoadType" />
+                      </xs:sequence>
+                    </xs:complexType>
+                  </xs:element>
+                </xs:sequence>
+              </xs:complexType>
+            </xs:element>
             <xs:element minOccurs="0" maxOccurs="1" name="OperationalOutputTimeSeries" nillable="true">
               <xs:complexType>
                 <xs:sequence>
Index: DamEngine/trunk/xsd/DamTimeSerie.xsd
===================================================================
diff -u -r6095 -r6096
--- DamEngine/trunk/xsd/DamTimeSerie.xsd	(.../DamTimeSerie.xsd)	(revision 6095)
+++ DamEngine/trunk/xsd/DamTimeSerie.xsd	(.../DamTimeSerie.xsd)	(revision 6096)
@@ -1,6 +1,12 @@
 <?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:include schemaLocation=".\OutputTypes\BishopCalculationGridTypeDefinition.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\UpliftVanCalculationGridTypeDefinition.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\BishopCalculatedSlipPlaneTypeDefinition.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\UpliftVanCalculatedSlipPlaneTypeDefinition.xsd" />
   <xs:complexType name="TimeSerie">
     <xs:sequence>
       <xs:element minOccurs="1" maxOccurs="1" name="TimeStep">
@@ -31,19 +37,15 @@
             <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:element minOccurs="0" maxOccurs="1" name="BishopCalculationGrid" type="BishopCalculationGridType" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="UpliftVanCalculationGrid" type="UpliftVanCalculationGridType" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="BishopCalculatedSlipPlane" type="BishopCalculatedSlipPlaneType" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="UpliftVanCalculatedSlipPlane" type="UpliftVanCalculatedSlipPlaneType" />
                 </xs:sequence>
                 <xs:attribute name="DateTime" type="xs:dateTime" use="required" />
                 <xs:attribute name="Value" type="xs:double" use="required" />
-                <xs:attribute name="Flag-nietechtgebruikt" type="xs:int" use="required" />
-                <xs:attribute name="BasisFileNameWMF" type="xs:string" use="required" />
-                <xs:attribute name="RelativeCalculationPathName" type="xs:string" use="required" />
+                <xs:attribute name="IsUplift" type="xs:boolean" />
               </xs:complexType>
             </xs:element>
           </xs:sequence>