Index: Core/Components/src/Core.Components.BruTile.Data/BruTileSettings.cs
===================================================================
diff -u -rfcc528ff894c3ef3521a3d4ec8adcda05ea5b54e -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Core/Components/src/Core.Components.BruTile.Data/BruTileSettings.cs	(.../BruTileSettings.cs)	(revision fcc528ff894c3ef3521a3d4ec8adcda05ea5b54e)
+++ Core/Components/src/Core.Components.BruTile.Data/BruTileSettings.cs	(.../BruTileSettings.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -37,27 +37,27 @@
         /// Gets a value indicating the maximum number of threads used for retrieving
         /// map tiles.
         /// </summary>
-        public static int MaximumNumberOfThreads { get; } = 4;
+        public static int MaximumNumberOfThreads => 4;
 
         /// <summary>
         /// Gets a value indicating which format should be used to store the tiles.
         /// </summary>
-        public static string PersistentCacheFormat { get; } = "png";
+        public static string PersistentCacheFormat => "png";
 
         /// <summary>
         /// Gets a value indicating how long tiles remain valid.
         /// </summary>
-        public static int PersistentCacheExpireInDays { get; } = 14;
+        public static int PersistentCacheExpireInDays => 14;
 
         /// <summary>
         /// Gets the <see cref="MemoryCache{T}.MinTiles"/> value
         /// </summary>
-        public static int MemoryCacheMinimum { get; } = 100;
+        public static int MemoryCacheMinimum => 100;
 
         /// <summary>
         /// Gets the <see cref="MemoryCache{T}.MaxTiles"/> value
         /// </summary>
-        public static int MemoryCacheMaximum { get; } = 200;
+        public static int MemoryCacheMaximum => 200;
 
         /// <summary>
         /// Gets the root directory path for the persistent cache.
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs	(.../DikeHeightCalculationInput.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs	(.../DikeHeightCalculationInput.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -101,9 +101,9 @@
             this.criticalOvertoppingStandardDeviation = criticalOvertoppingStandardDeviation;
         }
 
-        public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.DikeHeight;
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.DikeHeight;
 
-        public override int VariableId { get; } = 1;
+        public override int VariableId => 1;
 
         public override IEnumerable<HydraRingVariable> Variables
         {
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs
===================================================================
diff -u -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2 -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs	(.../DunesBoundaryConditionsCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs	(.../DunesBoundaryConditionsCalculationInput.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -35,9 +35,9 @@
         public DunesBoundaryConditionsCalculationInput(int sectionId, long hydraulicBoundaryLocationId, double norm)
             : base(sectionId, hydraulicBoundaryLocationId, norm) {}
 
-        public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.DunesBoundaryConditions;
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.DunesBoundaryConditions;
 
-        public override int CalculationTypeId { get; } = 2;
+        public override int CalculationTypeId => 2;
 
         public override int FaultTreeModelId => 8;
     }
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs
===================================================================
diff -u -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2 -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs	(.../OvertoppingRateCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs	(.../OvertoppingRateCalculationInput.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -98,9 +98,9 @@
             this.dikeHeight = dikeHeight;
         }
 
-        public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.OvertoppingRate;
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.OvertoppingRate;
 
-        public override int VariableId { get; } = 17;
+        public override int VariableId => 17;
 
         public override int CalculationTypeId => 2;
 
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs
===================================================================
diff -u -r773aa3005a70fa9fb34054679eef8a75184021bc -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs	(.../OvertoppingCalculationInput.cs)	(revision 773aa3005a70fa9fb34054679eef8a75184021bc)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs	(.../OvertoppingCalculationInput.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -126,9 +126,9 @@
             this.exponentModelFactorShallowUpperBoundary = exponentModelFactorShallowUpperBoundary;
         }
 
-        public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.DikesOvertopping;
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.DikesOvertopping;
 
-        public override int VariableId { get; } = 1;
+        public override int VariableId => 1;
 
         public override int FaultTreeModelId => 1017;
 
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Piping/PipingCalculationInput.cs
===================================================================
diff -u -r39c0d4fd00384ea7a17cad2ce31b316b63e721e2 -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Piping/PipingCalculationInput.cs	(.../PipingCalculationInput.cs)	(revision 39c0d4fd00384ea7a17cad2ce31b316b63e721e2)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Piping/PipingCalculationInput.cs	(.../PipingCalculationInput.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -230,9 +230,9 @@
             this.criticalHeaveGradientStandardDeviation = criticalHeaveGradientStandardDeviation;
         }
 
-        public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.Piping;
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.Piping;
 
-        public override int VariableId { get; } = 58;
+        public override int VariableId => 58;
 
         public override int FaultTreeModelId => hasCoverageLayer ? 3015 : 3014;
 
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs
===================================================================
diff -u -r773aa3005a70fa9fb34054679eef8a75184021bc -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs	(.../StructuresClosureCalculationInput.cs)	(revision 773aa3005a70fa9fb34054679eef8a75184021bc)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs	(.../StructuresClosureCalculationInput.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -122,9 +122,9 @@
             this.probabilityOpenStructureBeforeFlooding = probabilityOpenStructureBeforeFlooding;
         }
 
-        public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.StructuresClosure;
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.StructuresClosure;
 
-        public override int VariableId { get; } = 58;
+        public override int VariableId => 58;
 
         public override int FaultTreeModelId => 4505;
 
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs
===================================================================
diff -u -r773aa3005a70fa9fb34054679eef8a75184021bc -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs	(.../StructuresOvertoppingCalculationInput.cs)	(revision 773aa3005a70fa9fb34054679eef8a75184021bc)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs	(.../StructuresOvertoppingCalculationInput.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -138,9 +138,9 @@
             this.stormDurationVariation = stormDurationVariation;
         }
 
-        public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.StructuresOvertopping;
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.StructuresOvertopping;
 
-        public override int VariableId { get; } = 60;
+        public override int VariableId => 60;
 
         public override int FaultTreeModelId => 4404;
 
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs
===================================================================
diff -u -r773aa3005a70fa9fb34054679eef8a75184021bc -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs	(.../StructuresStabilityPointCalculationInput.cs)	(revision 773aa3005a70fa9fb34054679eef8a75184021bc)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs	(.../StructuresStabilityPointCalculationInput.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -233,9 +233,9 @@
             this.modificationFactorDynamicOrImpulsivePressureComponent = modificationFactorDynamicOrImpulsivePressureComponent;
         }
 
-        public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.StructuresStructuralFailure;
+        public override HydraRingFailureMechanismType FailureMechanismType => HydraRingFailureMechanismType.StructuresStructuralFailure;
 
-        public override int VariableId { get; } = 58;
+        public override int VariableId => 58;
 
         public override int FaultTreeModelId => 4607;
 
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs
===================================================================
diff -u -r773aa3005a70fa9fb34054679eef8a75184021bc -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs	(.../HydraulicLoadsCalculationInputTest.cs)	(revision 773aa3005a70fa9fb34054679eef8a75184021bc)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs	(.../HydraulicLoadsCalculationInputTest.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -167,9 +167,9 @@
                        exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation,
                        exponentModelFactorShallowLowerBoundary, exponentModelFactorShallowUpperBoundary) {}
 
-            public override HydraRingFailureMechanismType FailureMechanismType { get; } = (HydraRingFailureMechanismType) 1000;
+            public override HydraRingFailureMechanismType FailureMechanismType => (HydraRingFailureMechanismType) 1000;
 
-            public override int VariableId { get; } = -1;
+            public override int VariableId => -1;
         }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilModelTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilModelTest.cs	(.../MacroStabilityInwardsStochasticSoilModelTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilModelTest.cs	(.../MacroStabilityInwardsStochasticSoilModelTest.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -491,7 +491,7 @@
                 Name = name;
             }
 
-            public string Name { get; } = "";
+            public string Name => "";
 
             public IEnumerable<IMacroStabilityInwardsSoilLayer> Layers { get; }
 
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs
===================================================================
diff -u -r07370a0bcf299efaec6ad0685788d8bd170df824 -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs	(.../LogNormalDistributionDesignVariableProperties.cs)	(revision 07370a0bcf299efaec6ad0685788d8bd170df824)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs	(.../LogNormalDistributionDesignVariableProperties.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -57,7 +57,7 @@
                    designVariable,
                    handler) {}
 
-        public override string DistributionType { get; } = RiskeerCommonFormsResources.DistributionType_LogNormal;
+        public override string DistributionType => RiskeerCommonFormsResources.DistributionType_LogNormal;
 
         [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.LogNormalDistribution_Mean_Description))]
         public override RoundedDouble Mean
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs
===================================================================
diff -u -r07370a0bcf299efaec6ad0685788d8bd170df824 -r338d61802c139a519a89b0fae7bc76c27fb39ccf
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs	(.../NormalDistributionDesignVariableProperties.cs)	(revision 07370a0bcf299efaec6ad0685788d8bd170df824)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs	(.../NormalDistributionDesignVariableProperties.cs)	(revision 338d61802c139a519a89b0fae7bc76c27fb39ccf)
@@ -49,7 +49,7 @@
                    designVariable,
                    handler) {}
 
-        public override string DistributionType { get; } = RiskeerCommonFormsResources.DistributionType_Normal;
+        public override string DistributionType => RiskeerCommonFormsResources.DistributionType_Normal;
 
         [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.NormalDistribution_Mean_Description))]
         public override RoundedDouble Mean