Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CalculationParametersAssembler.cs
===================================================================
diff -u -r3693 -r3696
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CalculationParametersAssembler.cs	(.../CalculationParametersAssembler.cs)	(revision 3693)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CalculationParametersAssembler.cs	(.../CalculationParametersAssembler.cs)	(revision 3696)
@@ -25,12 +25,13 @@
 using System.Xml;
 using System.Xml.Linq;
 using System.Xml.Schema;
+using Deltares.Dam.Data;
+using Deltares.Dam.Data.Assemblers;
 using Deltares.Standard;
+using Deltares.Standard.Extensions;
 
-namespace Deltares.Dam.Data.Assemblers
+namespace Deltares.Dam.Application.Live
 {
-    using Standard.Extensions;
-
     /// <summary>
     /// 
     /// </summary>    
@@ -60,10 +61,10 @@
         public const string XmlMStabCalculationModelElementName = "CalculationModel";
         public const string XmlMStabSearchMethodElementName = "SearchMethod";
         public const string XmlMStabUseZonesElementName = "UseZones";
-        // Obsolete Mstab parameters
+        // Obsolete MStab parameters
         public const string XmlObsoleteMStabProbabilisticElementName = "Probabilistic";
-        public const string XmlObsoleteMStabIsOverrulePLLineCreationMethodName = "IsOverrulePLLineCreationMethod";
-        public const string XmlObsoleteMStabPLLineCreationMethodname = "PLLineCreationMethod";
+        public const string XmlObsoleteMStabIsOverrulePlLineCreationMethodName = "IsOverrulePLLineCreationMethod";
+        public const string XmlObsoleteMStabPlLineCreationMethodname = "PLLineCreationMethod";
         public const string XmlObsoleteMStabShearStrengthElementName = "ShearStrength";
 
         /// <summary>
@@ -93,7 +94,7 @@
         /// 
         /// </summary>
         public CalculationParametersAssembler()
-            : base(XmlElementName, XmlElementNamespace, Assembly.GetExecutingAssembly().GetEmbeddedFile(XsdEmbeddedResourcePath))
+            : base(XmlElementName, XmlElementNamespace, Assembly.GetAssembly(typeof(TimeSeriesAssembler)).GetEmbeddedFile(XsdEmbeddedResourcePath))
         {
         }
 
@@ -126,7 +127,6 @@
                 if (element != null && !found)
                 {
                     calculationModules.StabilityInside = int.Parse(element.Value) != 0;
-                    found = true;
                 }
                 element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityOutsideElementName);
                 if (element != null)
@@ -188,8 +188,7 @@
                 }
 
                 element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabUseZonesElementName);
-                mstabParameters.CalculationOptions = new MStabCalculationOptions();
-                mstabParameters.CalculationOptions.ZonesType = MStabZonesType.NoZones;
+                mstabParameters.CalculationOptions = new MStabCalculationOptions {ZonesType = MStabZonesType.NoZones};
                 if (element != null)
                 {
                     int useZones = int.Parse(element.Value);
@@ -198,8 +197,8 @@
 
                 // Check for obsolete keys
                 ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabProbabilisticElementName, FileName);
-                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabIsOverrulePLLineCreationMethodName, FileName);
-                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabPLLineCreationMethodname, FileName);
+                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabIsOverrulePlLineCreationMethodName, FileName);
+                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabPlLineCreationMethodname, FileName);
                 ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabShearStrengthElementName, FileName);
 
                 calculationParameters.MStabParameters = mstabParameters;
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CalculationParameters.cs
===================================================================
diff -u -r3693 -r3696
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CalculationParameters.cs	(.../CalculationParameters.cs)	(revision 3693)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CalculationParameters.cs	(.../CalculationParameters.cs)	(revision 3696)
@@ -19,14 +19,13 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.IO;
 using System.Xml.Linq;
-using Deltares.Dam.Data.Assemblers;
+using Deltares.Dam.Data;
 
-namespace Deltares.Dam.Data
+namespace Deltares.Dam.Application.Live
 {
-    using System;
-
     public class CalculationModules
     {
         public bool StabilityInside { get; set; }