Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs
===================================================================
diff -u -r4638 -r6092
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 4638)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 6092)
@@ -274,8 +274,8 @@
                     {
                         DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0),
                         Value = 1 + j * 0.1,
-                        Flag = 1,
-                        BasisFileName = String.Format("BasisFileName{0}", i)
+                        // Flag = 1,
+                        // BasisFileName = String.Format("BasisFileName{0}", i)
                     });
                 }
             }
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u -r5379 -r6092
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 5379)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 6092)
@@ -118,25 +118,25 @@
             for (var i = 0; i < outputTimeSerie.Entries.TimeSerieEntry.Length; i++)
             {
                 TimeSerieEntriesTimeSerieEntry entry = outputTimeSerie.Entries.TimeSerieEntry[i];
-                Stochast stochastValue = null;
-                if (entry.StochastValue != null)
-                {
-                    stochastValue = new Stochast
-                    {
-                        Distribution = entry.StochastValue.Distribution,
-                        Mean = entry.StochastValue.Mean,
-                        StandardDeviation = entry.StochastValue.StandardDeviation
-                    };
-                }
+                // Stochast stochastValue = null;
+                // if (entry.StochastValue != null)
+                // {
+                //     stochastValue = new Stochast
+                //     {
+                //         Distribution = entry.StochastValue.Distribution,
+                //         Mean = entry.StochastValue.Mean,
+                //         StandardDeviation = entry.StochastValue.StandardDeviation
+                //     };
+                // }
 
                 var timeSerieEntry = new TimeSerieEntry
                 {
                     DateTime = entry.DateTime,
-                    Value = entry.Value,
-                    BasisFileName = entry.BasisFileNameWMF,
-                    Flag = entry.Flagnietechtgebruikt,
-                    RelativeCalculationPathName = entry.RelativeCalculationPathName,
-                    StochastValue = stochastValue
+                    Value = entry.SafetyFactor,
+                    // BasisFileName = entry.BasisFileNameWMF,
+                    // Flag = entry.Flagnietechtgebruikt,
+                    // RelativeCalculationPathName = entry.RelativeCalculationPathName,
+                    // StochastValue = stochastValue
                 };
                 timeSerie.Entries.Add(timeSerieEntry);
             }
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs
===================================================================
diff -u -r4539 -r6092
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs	(.../FillXmlOutputFromDamUi.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs	(.../FillXmlOutputFromDamUi.cs)	(revision 6092)
@@ -94,25 +94,25 @@
             var timeSerieEntryIndex = 0;
             foreach (TimeSerieEntry timestepEntry in damTimeSerie.Entries)
             {
-                TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
-                if (timestepEntry.StochastValue != null)
-                {
-                    stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
-                    {
-                        Distribution = timestepEntry.StochastValue.Distribution,
-                        Mean = timestepEntry.StochastValue.Mean,
-                        StandardDeviation = timestepEntry.StochastValue.StandardDeviation
-                    };
-                }
+                // TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
+                // if (timestepEntry.StochastValue != null)
+                // {
+                //     stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
+                //     {
+                //         Distribution = timestepEntry.StochastValue.Distribution,
+                //         Mean = timestepEntry.StochastValue.Mean,
+                //         StandardDeviation = timestepEntry.StochastValue.StandardDeviation
+                //     };
+                // }
 
                 var timeStep = new TimeSerieEntriesTimeSerieEntry
                 {
                     DateTime = timestepEntry.DateTime,
-                    Value = timestepEntry.Value,
-                    BasisFileNameWMF = timestepEntry.BasisFileName,
-                    Flagnietechtgebruikt = timestepEntry.Flag,
-                    RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
-                    StochastValue = stochastValue
+                    SafetyFactor = timestepEntry.Value,
+                    // BasisFileNameWMF = timestepEntry.BasisFileName,
+                    // Flagnietechtgebruikt = timestepEntry.Flag,
+                    // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
+                    // StochastValue = stochastValue
                 };
                 outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep;
                 timeSerieEntryIndex++;