Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -52,6 +52,8 @@
             GeneralInput = new GeneralClosingStructuresInput();
             ClosingStructures = new StructureCollection<ClosingStructure>();
             ForeshoreProfiles = new ForeshoreProfileCollection();
+
+            CalculationsInputComments = new Comment();
         }
 
         /// <summary>
@@ -72,5 +74,7 @@
         public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().Cast<StructuresCalculation<ClosingStructuresInput>>();
 
         public CalculationGroup CalculationsGroup { get; }
+
+        public Comment CalculationsInputComments { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs
===================================================================
diff -u -r548d487e693b335827451b4f395f1b30e20b9e3e -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs	(.../ClosingStructuresFailureMechanismTest.cs)	(revision 548d487e693b335827451b4f395f1b30e20b9e3e)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs	(.../ClosingStructuresFailureMechanismTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -54,6 +54,8 @@
 
             CollectionAssert.IsEmpty(failureMechanism.Sections);
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
+
+            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
         }
 
         [Test]
Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs	(.../FailureMechanismBase.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs	(.../FailureMechanismBase.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -61,8 +61,6 @@
             InAssemblyOutputComments = new Comment();
             NotInAssemblyComments = new Comment();
 
-            CalculationsInputComments = new Comment();
-
             AssemblyResult = new FailurePathAssemblyResult();
             sectionResults = new ObservableList<T>();
         }
@@ -71,8 +69,6 @@
 
         public string Code { get; }
 
-        public Comment CalculationsInputComments { get; }
-
         public IEnumerable<FailureMechanismSection> Sections => sectionCollection;
 
         public FailurePathAssemblyResult AssemblyResult { get; }
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs	(.../FailureMechanismBaseTest.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs	(.../FailureMechanismBaseTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -76,7 +76,6 @@
             Assert.IsNotNull(failureMechanism.InAssemblyInputComments);
             Assert.IsNotNull(failureMechanism.InAssemblyOutputComments);
             Assert.IsNotNull(failureMechanism.NotInAssemblyComments);
-            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
             Assert.IsNotNull(failureMechanism.AssemblyResult);
             Assert.IsTrue(failureMechanism.InAssembly);
             CollectionAssert.IsEmpty(failureMechanism.Sections);
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs	(.../TestFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs	(.../TestFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -69,10 +69,13 @@
             CalculationsGroup = new CalculationGroup();
             CalculationsGroup.Children.AddRange(calculations);
             GeneralInput = new GeneralInput();
+            CalculationsInputComments = new Comment();
         }
 
         public CalculationGroup CalculationsGroup { get; }
 
+        public Comment CalculationsInputComments { get; }
+
         public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
 
         public GeneralInput GeneralInput { get; }
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs	(.../StructuresFailureMechanismResultViewTest.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs	(.../StructuresFailureMechanismResultViewTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
+using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
@@ -368,6 +369,8 @@
             public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
 
             public CalculationGroup CalculationsGroup { get; }
+
+            public Comment CalculationsInputComments { get; }
         }
     }
 }
\ No newline at end of file
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs	(.../DuneErosionFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs	(.../DuneErosionFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
+using Riskeer.Common.Data;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.DuneErosion.Data.Properties;
 
@@ -44,6 +45,7 @@
         {
             GeneralInput = new GeneralDuneErosionInput();
             DuneLocationCalculationsForUserDefinedTargetProbabilities = new ObservableList<DuneLocationCalculationsForTargetProbability>();
+            CalculationsInputComments = new Comment();
         }
 
         /// <summary>
@@ -62,6 +64,11 @@
         public ObservableList<DuneLocationCalculationsForTargetProbability> DuneLocationCalculationsForUserDefinedTargetProbabilities { get; }
 
         /// <summary>
+        /// Gets the input comments associated with the calculations of the data object.
+        /// </summary>
+        public Comment CalculationsInputComments { get; }
+
+        /// <summary>
         /// Sets dune locations and calculations for the failure mechanism.
         /// </summary>
         /// <param name="duneLocations">The dune locations to add to the failure mechanism.</param>
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs
===================================================================
diff -u -r548d487e693b335827451b4f395f1b30e20b9e3e -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs	(.../DuneErosionFailureMechanismTest.cs)	(revision 548d487e693b335827451b4f395f1b30e20b9e3e)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs	(.../DuneErosionFailureMechanismTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -46,6 +46,8 @@
             Assert.IsNotNull(failureMechanism.GeneralInput);
 
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
+
+            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
         }
 
         [Test]
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs	(.../GrassCoverErosionInwardsFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs	(.../GrassCoverErosionInwardsFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -21,6 +21,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Riskeer.Common.Data;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.FailureMechanism;
@@ -47,6 +48,7 @@
             };
             GeneralInput = new GeneralGrassCoverErosionInwardsInput();
             DikeProfiles = new DikeProfileCollection();
+            CalculationsInputComments = new Comment();
         }
 
         /// <summary>
@@ -62,5 +64,7 @@
         public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<GrassCoverErosionInwardsCalculation>();
 
         public CalculationGroup CalculationsGroup { get; }
+
+        public Comment CalculationsInputComments { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs
===================================================================
diff -u -r548d487e693b335827451b4f395f1b30e20b9e3e -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs	(.../GrassCoverErosionInwardsFailureMechanismTest.cs)	(revision 548d487e693b335827451b4f395f1b30e20b9e3e)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs	(.../GrassCoverErosionInwardsFailureMechanismTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -56,6 +56,8 @@
             CollectionAssert.IsEmpty(failureMechanism.DikeProfiles);
 
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
+
+            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
         }
 
         [Test]
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs	(.../GrassCoverErosionOutwardsFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs	(.../GrassCoverErosionOutwardsFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -21,6 +21,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Riskeer.Common.Data;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.FailureMechanism;
@@ -48,6 +49,7 @@
                 Name = RiskeerCommonDataResources.HydraulicBoundaryConditions_DisplayName
             };
             ForeshoreProfiles = new ForeshoreProfileCollection();
+            CalculationsInputComments = new Comment();
         }
 
         /// <summary>
@@ -63,5 +65,7 @@
         public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<GrassCoverErosionOutwardsWaveConditionsCalculation>();
 
         public CalculationGroup CalculationsGroup { get; }
+
+        public Comment CalculationsInputComments { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs
===================================================================
diff -u -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -51,6 +51,8 @@
             CollectionAssert.IsEmpty(failureMechanism.Calculations);
 
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
+
+            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
         }
 
         [Test]
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -50,6 +50,7 @@
             GeneralInput = new GeneralHeightStructuresInput();
             HeightStructures = new StructureCollection<HeightStructure>();
             ForeshoreProfiles = new ForeshoreProfileCollection();
+            CalculationsInputComments = new Comment();
         }
 
         /// <summary>
@@ -73,5 +74,7 @@
         /// Gets the container of all calculations.
         /// </summary>
         public CalculationGroup CalculationsGroup { get; }
+
+        public Comment CalculationsInputComments { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs
===================================================================
diff -u -r548d487e693b335827451b4f395f1b30e20b9e3e -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision 548d487e693b335827451b4f395f1b30e20b9e3e)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -53,6 +53,8 @@
             CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles);
 
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
+
+            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
         }
 
         [Test]
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs	(.../MacroStabilityInwardsFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs	(.../MacroStabilityInwardsFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
+using Riskeer.Common.Data;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.MacroStabilityInwards.Data.Properties;
@@ -48,6 +49,7 @@
             {
                 Name = RiskeerCommonDataResources.FailureMechanism_Calculations_DisplayName
             };
+            CalculationsInputComments = new Comment();
         }
 
         /// <summary>
@@ -74,5 +76,7 @@
         public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
 
         public CalculationGroup CalculationsGroup { get; }
+
+        public Comment CalculationsInputComments { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs
===================================================================
diff -u -r548d487e693b335827451b4f395f1b30e20b9e3e -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs	(.../MacroStabilityInwardsFailureMechanismTest.cs)	(revision 548d487e693b335827451b4f395f1b30e20b9e3e)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs	(.../MacroStabilityInwardsFailureMechanismTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -50,6 +50,8 @@
             Assert.IsNotNull(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput);
 
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
+
+            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
         }
 
         [Test]
Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -21,6 +21,7 @@
 
 using System.Collections.Generic;
 using Core.Common.Base;
+using Riskeer.Common.Data;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Piping.Data.SoilProfile;
@@ -53,6 +54,7 @@
 
             ScenarioConfigurationType = PipingScenarioConfigurationType.SemiProbabilistic;
             scenarioConfigurationsPerFailureMechanismSection = new ObservableList<PipingScenarioConfigurationPerFailureMechanismSection>();
+            CalculationsInputComments = new Comment();
         }
 
         /// <summary>
@@ -91,6 +93,8 @@
 
         public CalculationGroup CalculationsGroup { get; }
 
+        public Comment CalculationsInputComments { get; }
+
         protected override void AddSectionDependentData(FailureMechanismSection section)
         {
             base.AddSectionDependentData(section);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs
===================================================================
diff -u -r8cf628ae680230501eee8daa02cf2ed50dd02d45 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision 8cf628ae680230501eee8daa02cf2ed50dd02d45)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -57,6 +57,8 @@
 
             Assert.AreEqual(PipingScenarioConfigurationType.SemiProbabilistic, failureMechanism.ScenarioConfigurationType);
             CollectionAssert.IsEmpty(failureMechanism.ScenarioConfigurationsPerFailureMechanismSection);
+
+            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
         }
 
         [Test]
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs	(.../StabilityPointStructuresFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs	(.../StabilityPointStructuresFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -51,6 +51,7 @@
             GeneralInput = new GeneralStabilityPointStructuresInput();
             StabilityPointStructures = new StructureCollection<StabilityPointStructure>();
             ForeshoreProfiles = new ForeshoreProfileCollection();
+            CalculationsInputComments = new Comment();
         }
 
         /// <summary>
@@ -71,5 +72,7 @@
         public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().Cast<StructuresCalculation<StabilityPointStructuresInput>>();
 
         public CalculationGroup CalculationsGroup { get; }
+
+        public Comment CalculationsInputComments { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs	(.../StabilityStoneCoverFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs	(.../StabilityStoneCoverFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -21,6 +21,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Riskeer.Common.Data;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.FailureMechanism;
@@ -48,6 +49,7 @@
             };
             GeneralInput = new GeneralStabilityStoneCoverWaveConditionsInput();
             ForeshoreProfiles = new ForeshoreProfileCollection();
+            CalculationsInputComments = new Comment();
         }
 
         /// <summary>
@@ -63,5 +65,7 @@
         public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<StabilityStoneCoverWaveConditionsCalculation>();
 
         public CalculationGroup CalculationsGroup { get; }
+
+        public Comment CalculationsInputComments { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs
===================================================================
diff -u -rce73d815b0583615c74550ba004fd553202b43fe -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs	(.../StabilityStoneCoverFailureMechanismTest.cs)	(revision ce73d815b0583615c74550ba004fd553202b43fe)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs	(.../StabilityStoneCoverFailureMechanismTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -51,6 +51,8 @@
             CollectionAssert.IsEmpty(failureMechanism.Calculations);
 
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
+
+            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
         }
 
         [Test]
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r83ffc93b059276cb14b8888ea7d6404093524597 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs	(.../DuneErosionFailureMechanismCreateExtensions.cs)	(revision 83ffc93b059276cb14b8888ea7d6404093524597)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs	(.../DuneErosionFailureMechanismCreateExtensions.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Base;
+using Core.Common.Util.Extensions;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.DuneErosion.Data;
 using Riskeer.Storage.Core.Create.FailureMechanismSectionResults;
@@ -44,6 +45,8 @@
         internal static FailureMechanismEntity Create(this DuneErosionFailureMechanism mechanism, PersistenceRegistry registry)
         {
             FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.DuneErosion, registry);
+            entity.CalculationsInputComments = mechanism.CalculationsInputComments.Body.DeepClone();
+
             AddEntitiesForSectionResults(mechanism.SectionResults, registry);
             AddEntitiesForDuneLocations(mechanism.DuneLocations, entity, registry);
             AddEntitiesForFailureMechanismMeta(mechanism, entity, registry);
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -r3c1ada872501043f0a1713c6a3a9af7aae23a56b -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 3c1ada872501043f0a1713c6a3a9af7aae23a56b)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -797,6 +797,8 @@
                                                                ReadConversionCollector collector)
         {
             entity.ReadCommonFailurePathProperties(failureMechanism, collector);
+            failureMechanism.CalculationsInputComments.Body = entity.CalculationsInputComments;
+
             entity.ReadDuneErosionMechanismSectionResults(failureMechanism, collector);
             entity.ReadGeneralDuneErosionInput(failureMechanism.GeneralInput);
             entity.ReadDuneLocations(failureMechanism, collector);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -rfb193b728013e593803f27d6461fdb932062e058 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision fb193b728013e593803f27d6461fdb932062e058)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -431,14 +431,20 @@
         #region Dune Erosion
 
         [Test]
-        public void ReadAsDuneErosionFailureMechanism_WithMeta_ReturnFailureMechanismWithGeneralInputSet()
+        public void ReadAsDuneErosionFailureMechanism_WithProperties_SetsFailureMechanismWithProperties()
         {
             // Setup
             const int generalInputN = 3;
 
+            var random = new Random(31);
+            bool inAssembly = random.NextBoolean();
             var entity = new FailureMechanismEntity
             {
-                CalculationGroupEntity = new CalculationGroupEntity(),
+                InAssembly = Convert.ToByte(inAssembly),
+                InAssemblyInputComments = "Some input text",
+                InAssemblyOutputComments = "Some output text",
+                NotInAssemblyComments = "Really not in assembly",
+                CalculationsInputComments = "Some calculation text",
                 DuneErosionFailureMechanismMetaEntities =
                 {
                     new DuneErosionFailureMechanismMetaEntity
@@ -454,6 +460,13 @@
             entity.ReadAsDuneErosionFailureMechanism(failureMechanism, collector);
 
             // Assert
+            Assert.AreEqual(inAssembly, failureMechanism.InAssembly);
+            Assert.AreEqual(entity.InAssemblyInputComments, failureMechanism.InAssemblyInputComments.Body);
+            Assert.AreEqual(entity.InAssemblyOutputComments, failureMechanism.InAssemblyOutputComments.Body);
+            Assert.AreEqual(entity.NotInAssemblyComments, failureMechanism.NotInAssemblyComments.Body);
+            Assert.AreEqual(entity.CalculationsInputComments, failureMechanism.CalculationsInputComments.Body);
+            CollectionAssert.IsEmpty(failureMechanism.Sections);
+
             Assert.AreEqual(generalInputN, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy());
         }
 
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs
===================================================================
diff -u -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs	(.../WaveImpactAsphaltCoverFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs	(.../WaveImpactAsphaltCoverFailureMechanism.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -21,6 +21,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Riskeer.Common.Data;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.FailureMechanism;
@@ -50,6 +51,7 @@
             ForeshoreProfiles = new ForeshoreProfileCollection();
             GeneralInput = new GeneralWaveConditionsInput(1.0, 0.0, 0.0);
             GeneralWaveImpactAsphaltCoverInput = new GeneralWaveImpactAsphaltCoverInput();
+            CalculationsInputComments = new Comment();
         }
 
         /// <summary>
@@ -70,5 +72,7 @@
         public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<WaveImpactAsphaltCoverWaveConditionsCalculation>();
 
         public CalculationGroup CalculationsGroup { get; }
+
+        public Comment CalculationsInputComments { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs
===================================================================
diff -u -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 -rddad604681c45ff2276b5b75590b8699d6c211d4
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismTest.cs)	(revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismTest.cs)	(revision ddad604681c45ff2276b5b75590b8699d6c211d4)
@@ -52,6 +52,8 @@
 
             CollectionAssert.IsEmpty(failureMechanism.Sections);
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
+
+            Assert.IsNotNull(failureMechanism.CalculationsInputComments);
         }
 
         [Test]