Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs
===================================================================
diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs	(.../StructuresOvertoppingCalculationInput.cs)	(revision d49770201655964042adccca08d2e9fb2217723d)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs	(.../StructuresOvertoppingCalculationInput.cs)	(revision 077ced627bcacbf6095471e30af352fbf2e4298d)
@@ -163,50 +163,25 @@
             }
         }
 
-        public override IEnumerable<HydraRingVariable> Variables
+        public override IEnumerable<HydraRingVariable2> NewVariables
         {
             get
             {
-                yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, gravitationalAcceleration,
-                                                   HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-                yield return new HydraRingVariable(59, HydraRingDistributionType.LogNormal, double.NaN,
-                                                   HydraRingDeviationType.Standard, modelFactorOvertoppingFlowMean,
-                                                   modelFactorOvertoppingFlowStandardDeviation, double.NaN);
-                yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN,
-                                                   HydraRingDeviationType.Standard, levelCrestStructureMean,
-                                                   levelCrestStructureStandardDeviation, double.NaN);
-                yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, structureNormalOrientation,
-                                                   HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-                yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN,
-                                                   HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean,
-                                                   modelFactorSuperCriticalFlowStandardDeviation, double.NaN);
-                yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN,
-                                                   HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean,
-                                                   allowedLevelIncreaseStorageStandardDeviation, double.NaN);
-                yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN,
-                                                   HydraRingDeviationType.Standard, modelFactorStorageVolumeMean,
-                                                   modelFactorStorageVolumeStandardDeviation, double.NaN);
-                yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN,
-                                                   HydraRingDeviationType.Variation, storageStructureAreaMean,
-                                                   storageStructureAreaVariation, double.NaN);
-                yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, modelFactorInflowVolume,
-                                                   HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-                yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN,
-                                                   HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean,
-                                                   flowWidthAtBottomProtectionStandardDeviation, double.NaN);
-                yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN,
-                                                   HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean,
-                                                   criticalOvertoppingDischargeVariation, double.NaN);
-                yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, failureProbabilityStructureWithErosion,
-                                                   HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-                yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN,
-                                                   HydraRingDeviationType.Variation, widthFlowAperturesMean,
-                                                   widthFlowAperturesVariation, double.NaN);
-                yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, deviationWaveDirection,
-                                                   HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-                yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN,
-                                                   HydraRingDeviationType.Variation, stormDurationMean,
-                                                   stormDurationVariation, double.NaN);
+                yield return new DeterministicHydraRingVariable(58, gravitationalAcceleration);
+                yield return new LogNormalHydraRingVariable(59, HydraRingDeviationType.Standard, modelFactorOvertoppingFlowMean, modelFactorOvertoppingFlowStandardDeviation);
+                yield return new NormalHydraRingVariable(60, HydraRingDeviationType.Standard, levelCrestStructureMean, levelCrestStructureStandardDeviation);
+                yield return new DeterministicHydraRingVariable(61, structureNormalOrientation);
+                yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation);
+                yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation);
+                yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation);
+                yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, storageStructureAreaMean, storageStructureAreaVariation);
+                yield return new DeterministicHydraRingVariable(97, modelFactorInflowVolume);
+                yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation);
+                yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation);
+                yield return new DeterministicHydraRingVariable(105, failureProbabilityStructureWithErosion);
+                yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesVariation);
+                yield return new DeterministicHydraRingVariable(107, deviationWaveDirection);
+                yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, stormDurationMean, stormDurationVariation);
             }
         }