Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -r9793bc3048c48b4c25bcde1d0c07d6d02b53b2ff -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs	(.../GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs)	(revision 9793bc3048c48b4c25bcde1d0c07d6d02b53b2ff)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs	(.../GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -54,7 +54,7 @@
                 Name = calculation.Name.DeepClone(),
                 Comments = calculation.Comments.Body.DeepClone(),
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 Order = order
             };
             SetInputValues(entity, calculation.InputParameters, registry);
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -54,7 +54,7 @@
             {
                 Name = calculation.Name.DeepClone(),
                 Comment = calculation.Comments.Body.DeepClone(),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
                 Order = order
             };
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -rca6a51a3a62bfe3bfdceeabfc803f195a1e32a36 -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioCreateExtensions.cs	(.../SemiProbabilisticPipingCalculationScenarioCreateExtensions.cs)	(revision ca6a51a3a62bfe3bfdceeabfc803f195a1e32a36)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioCreateExtensions.cs	(.../SemiProbabilisticPipingCalculationScenarioCreateExtensions.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -52,7 +52,7 @@
             var entity = new SemiProbabilisticPipingCalculationEntity
             {
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 Name = calculation.Name.DeepClone(),
                 Comments = calculation.Comments.Body.DeepClone(),
                 Order = order
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/StructuresCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -r3ec4914aaaf4219b33f6ff3ce04759bf2acd597c -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/StructuresCalculationScenarioCreateExtensions.cs	(.../StructuresCalculationScenarioCreateExtensions.cs)	(revision 3ec4914aaaf4219b33f6ff3ce04759bf2acd597c)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/StructuresCalculationScenarioCreateExtensions.cs	(.../StructuresCalculationScenarioCreateExtensions.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -112,7 +112,7 @@
             {
                 Name = calculation.Name.DeepClone(),
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 Comments = calculation.Comments.Body.DeepClone(),
                 Order = order
             };
@@ -201,7 +201,7 @@
             {
                 Name = calculation.Name.DeepClone(),
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 Comments = calculation.Comments.Body.DeepClone(),
                 Order = order
             };
@@ -266,7 +266,7 @@
             {
                 Name = calculation.Name.DeepClone(),
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 Comments = calculation.Comments.Body.DeepClone(),
                 Order = order
             };
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs
===================================================================
diff -u -r3ec4914aaaf4219b33f6ff3ce04759bf2acd597c -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs	(.../ClosingStructuresCalculationEntityReadExtensions.cs)	(revision 3ec4914aaaf4219b33f6ff3ce04759bf2acd597c)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs	(.../ClosingStructuresCalculationEntityReadExtensions.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -56,7 +56,7 @@
             {
                 Name = entity.Name,
                 IsRelevant = Convert.ToBoolean(entity.RelevantForScenario),
-                Contribution = (RoundedDouble) entity.ScenarioContribution.ToNullAsNaN(),
+                Contribution = (RoundedDouble) entity.ScenarioContribution,
                 Comments =
                 {
                     Body = entity.Comments
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs
===================================================================
diff -u -r2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs)	(revision 2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -59,7 +59,7 @@
                     Body = entity.Comments
                 },
                 IsRelevant = Convert.ToBoolean(entity.RelevantForScenario),
-                Contribution = (RoundedDouble) entity.ScenarioContribution.ToNullAsNaN()
+                Contribution = (RoundedDouble) entity.ScenarioContribution
             };
             ReadInput(calculation.InputParameters, entity, collector);
             ReadOutput(calculation, entity);
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs
===================================================================
diff -u -r2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs	(.../HeightStructuresCalculationEntityReadExtensions.cs)	(revision 2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs	(.../HeightStructuresCalculationEntityReadExtensions.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -56,7 +56,7 @@
             {
                 Name = entity.Name,
                 IsRelevant = Convert.ToBoolean(entity.RelevantForScenario),
-                Contribution = (RoundedDouble) entity.ScenarioContribution.ToNullAsNaN(),
+                Contribution = (RoundedDouble) entity.ScenarioContribution,
                 Comments =
                 {
                     Body = entity.Comments
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs
===================================================================
diff -u -r2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs	(.../MacroStabilityInwardsCalculationEntityReadExtensions.cs)	(revision 2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs	(.../MacroStabilityInwardsCalculationEntityReadExtensions.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -55,7 +55,7 @@
             {
                 Name = entity.Name,
                 IsRelevant = Convert.ToBoolean(entity.RelevantForScenario),
-                Contribution = (RoundedDouble) entity.ScenarioContribution.ToNullAsNaN(),
+                Contribution = (RoundedDouble) entity.ScenarioContribution,
                 Comments =
                 {
                     Body = entity.Comment
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationEntityReadExtensions.cs
===================================================================
diff -u -r2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationEntityReadExtensions.cs	(.../SemiProbabilisticPipingCalculationEntityReadExtensions.cs)	(revision 2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationEntityReadExtensions.cs	(.../SemiProbabilisticPipingCalculationEntityReadExtensions.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -53,7 +53,7 @@
             var calculation = new SemiProbabilisticPipingCalculationScenario
             {
                 IsRelevant = Convert.ToBoolean(entity.RelevantForScenario),
-                Contribution = (RoundedDouble) entity.ScenarioContribution.ToNullAsNaN(),
+                Contribution = (RoundedDouble) entity.ScenarioContribution,
                 Name = entity.Name,
                 Comments =
                 {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs
===================================================================
diff -u -r3ec4914aaaf4219b33f6ff3ce04759bf2acd597c -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs	(.../StabilityPointStructuresCalculationEntityReadExtensions.cs)	(revision 3ec4914aaaf4219b33f6ff3ce04759bf2acd597c)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs	(.../StabilityPointStructuresCalculationEntityReadExtensions.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -56,7 +56,7 @@
             {
                 Name = entity.Name,
                 IsRelevant = Convert.ToBoolean(entity.RelevantForScenario),
-                Contribution = (RoundedDouble) entity.ScenarioContribution.ToNullAsNaN(),
+                Contribution = (RoundedDouble) entity.ScenarioContribution,
                 Comments =
                 {
                     Body = entity.Comments
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -ra1d45c457f81a617dffa6ab6d9f849035542aaf8 -r1004c07007b030cb1014d77a5c12f2132863ab92
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationEntityReadExtensionsTest.cs	(.../SemiProbabilisticPipingCalculationEntityReadExtensionsTest.cs)	(revision a1d45c457f81a617dffa6ab6d9f849035542aaf8)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationEntityReadExtensionsTest.cs	(.../SemiProbabilisticPipingCalculationEntityReadExtensionsTest.cs)	(revision 1004c07007b030cb1014d77a5c12f2132863ab92)
@@ -68,7 +68,7 @@
             var entity = new SemiProbabilisticPipingCalculationEntity
             {
                 RelevantForScenario = Convert.ToByte(isRelevant),
-                ScenarioContribution = contribution.ToNaNAsNull(),
+                ScenarioContribution = contribution,
                 Name = name,
                 Comments = comments,
                 EntryPointL = entryPoint.ToNaNAsNull(),