Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
===================================================================
diff -u -r2547 -r2579
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 2547)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 2579)
@@ -50,11 +50,6 @@
             {
                 LocationScenarioId = null;
             }
-            private double upliftCriterionPiping = 1.2;
-            private double upliftCriterionStability = 1.2;
-            private double safetyFactorPiping = 1.0;
-            private double safetyFactorStabilityInnerSlope = 1.0;
-            private double safetyFactorStabilityOuterSlope = 1.0;
 
             public int ScenarioRecordId { get; set; } 
             public string LocationId { get; set; } //required
@@ -73,35 +68,11 @@
             public double? HeadPl3 { get; set; } //optional
             public double? HeadPl4 { get; set; } //optional
 
-            public double UpliftCriterionPiping
-            {
-                get { return upliftCriterionPiping; }
-                set { upliftCriterionPiping = value; }
-            }
-
-            public double UpliftCriterionStability
-            {
-                get { return upliftCriterionStability; }
-                set { upliftCriterionStability = value; }
-            }
-
-            public double SafetyFactorPiping
-            {
-                get { return safetyFactorPiping; }
-                set { safetyFactorPiping = value; }
-            }
-
-            public double SafetyFactorStabilityInnerSlope
-            {
-                get { return safetyFactorStabilityInnerSlope; }
-                set { safetyFactorStabilityInnerSlope = value; }
-            }
-
-            public double SafetyFactorStabilityOuterSlope
-            {
-                get { return safetyFactorStabilityOuterSlope; }
-                set { safetyFactorStabilityOuterSlope = value; }
-            }
+            public double? UpliftCriterionPiping { get; set; } //optional
+            public double? UpliftCriterionStability { get; set; } //optional
+            public double? SafetyFactorPiping { get; set; } //optional
+            public double? SafetyFactorStabilityInnerSlope { get; set; } //optional
+            public double? SafetyFactorStabilityOuterSlope { get; set; } //optional
         }
 
         private void CheckColumn(int index, string fileName, string fieldName)
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r2576 -r2579
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 2576)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 2579)
@@ -648,18 +648,37 @@
                     }
                     else
                     {
+                        var modelFactors = new ModelFactors();
+                        if (scenarioRecord.SafetyFactorStabilityInnerSlope.HasValue)
+                        {
+                            modelFactors.RequiredSafetyFactorStabilityInnerSlope =
+                                scenarioRecord.SafetyFactorStabilityInnerSlope.Value;
+                        }
+                        if (scenarioRecord.SafetyFactorStabilityOuterSlope.HasValue)
+                        {
+                            modelFactors.RequiredSafetyFactorStabilityOuterSlope =
+                                scenarioRecord.SafetyFactorStabilityOuterSlope.Value;
+                        }
+                        if (scenarioRecord.SafetyFactorPiping.HasValue)
+                        {
+                            modelFactors.RequiredSafetyFactorPiping =
+                                scenarioRecord.SafetyFactorPiping.Value;
+                        }
+                        if (scenarioRecord.UpliftCriterionStability.HasValue)
+                        {
+                            modelFactors.UpliftCriterionStability =
+                                scenarioRecord.UpliftCriterionStability.Value;
+                        }
+                        if (scenarioRecord.UpliftCriterionPiping.HasValue)
+                        {
+                            modelFactors.UpliftCriterionPiping =
+                                scenarioRecord.UpliftCriterionPiping.Value;
+                        }
                         var scenario = new Scenario
                         {
                             Location = dikeLocation, 
                             LocationScenarioID = scenarioRecord.LocationScenarioId, 
-                            ModelFactors =
-                            {
-                                RequiredSafetyFactorStabilityInnerSlope = scenarioRecord.SafetyFactorStabilityInnerSlope, 
-                                RequiredSafetyFactorStabilityOuterSlope = scenarioRecord.SafetyFactorStabilityOuterSlope, 
-                                RequiredSafetyFactorPiping = scenarioRecord.SafetyFactorPiping, 
-                                UpliftCriterionPiping = scenarioRecord.UpliftCriterionPiping, 
-                                UpliftCriterionStability = scenarioRecord.UpliftCriterionStability
-                            },
+                            ModelFactors = modelFactors
                         };
                         var locationRecord = LocationRecords.FirstOrDefault(l => l.LocationId == scenarioRecord.LocationId);
                         // set values in scenario (1 from scenariorecord, 2 from locationrecord, 3 default)