Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rd021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs	(.../DuneErosionMapDataFeaturesFactory.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs	(.../DuneErosionMapDataFeaturesFactory.cs)	(revision d021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4)
@@ -73,6 +73,12 @@
                                                                                          Resources.MetaData_WaveHeight_TargetProbability_0);
             HydraulicBoundaryLocationMapDataFeaturesFactory.AddTargetProbabilityMetaData(feature, location.WavePeriodCalculationsForTargetProbabilities,
                                                                                          Resources.MetaData_WavePeriod_TargetProbability_0);
+            HydraulicBoundaryLocationMapDataFeaturesFactory.AddTargetProbabilityMetaData(feature, location.MeanTidalAmplitudeCalculationsForTargetProbabilities,
+                                                                                         Resources.MetaData_MeanTidalAmplitude_TargetProbability_0);
+            HydraulicBoundaryLocationMapDataFeaturesFactory.AddTargetProbabilityMetaData(feature, location.WaveDirectionalSpreadCalculationsForTargetProbabilities,
+                                                                                         Resources.MetaData_WaveDirectionalSpread_TargetProbability_0);
+            HydraulicBoundaryLocationMapDataFeaturesFactory.AddTargetProbabilityMetaData(feature, location.TideSurgePhaseDifferenceCalculationsForTargetProbabilities,
+                                                                                         Resources.MetaData_TideSurgePhaseDifference_TargetProbability_0);
 
             return feature;
         }
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -re41f2b63d721ff33c008eb595bffe6cdb2588626 -rd021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e41f2b63d721ff33c008eb595bffe6cdb2588626)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4)
@@ -1,28 +1,6 @@
-// Copyright (C) Stichting Deltares 2022. All rights reserved.
-//
-// This file is part of Riskeer.
-//
-// Riskeer is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-// All names, logos, and references to "Deltares" are registered trademarks of
-// Stichting Deltares and remain full property of Stichting Deltares at all times.
-// All rights reserved.
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -244,6 +222,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Gemiddelde getijamplitude - {0}.
+        /// </summary>
+        internal static string MetaData_MeanTidalAmplitude_TargetProbability_0 {
+            get {
+                return ResourceManager.GetString("MetaData_MeanTidalAmplitude_TargetProbability_0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Metrering.
         /// </summary>
         internal static string MetaData_Offset {
@@ -253,6 +240,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Faseverschuiving tussen getij en opzet - {0}.
+        /// </summary>
+        internal static string MetaData_TideSurgePhaseDifference_TargetProbability_0 {
+            get {
+                return ResourceManager.GetString("MetaData_TideSurgePhaseDifference_TargetProbability_0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Rekenwaarde h - {0}.
         /// </summary>
         internal static string MetaData_WaterLevel_TargetProbability_0 {
@@ -262,6 +258,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Golfrichtingspreiding - {0}.
+        /// </summary>
+        internal static string MetaData_WaveDirectionalSpread_TargetProbability_0 {
+            get {
+                return ResourceManager.GetString("MetaData_WaveDirectionalSpread_TargetProbability_0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Rekenwaarde Hs - {0}.
         /// </summary>
         internal static string MetaData_WaveHeight_TargetProbability_0 {
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.resx
===================================================================
diff -u -re41f2b63d721ff33c008eb595bffe6cdb2588626 -rd021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision e41f2b63d721ff33c008eb595bffe6cdb2588626)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision d021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4)
@@ -183,4 +183,13 @@
   <data name=" DuneLocationCalculationOutput_TideSurgePhaseDifference_DisplayName" xml:space="preserve">
     <value>Faseverschuiving tussen getij en opzet [uur]</value>
   </data>
+  <data name="MetaData_MeanTidalAmplitude_TargetProbability_0" xml:space="preserve">
+    <value>Gemiddelde getijamplitude - {0}</value>
+  </data>
+  <data name="MetaData_WaveDirectionalSpread_TargetProbability_0" xml:space="preserve">
+    <value>Golfrichtingspreiding - {0}</value>
+  </data>
+  <data name="MetaData_TideSurgePhaseDifference_TargetProbability_0" xml:space="preserve">
+    <value>Faseverschuiving tussen getij en opzet - {0}</value>
+  </data>
 </root>
\ No newline at end of file
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.TestUtil/DuneErosionMapFeaturesTestHelper.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rd021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.TestUtil/DuneErosionMapFeaturesTestHelper.cs	(.../DuneErosionMapFeaturesTestHelper.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.TestUtil/DuneErosionMapFeaturesTestHelper.cs	(.../DuneErosionMapFeaturesTestHelper.cs)	(revision d021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4)
@@ -76,23 +76,32 @@
                 var presentedMetaDataItems = new List<string>();
                 foreach (DuneLocationCalculationsForTargetProbability calculationsForTargetProbability in failureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities)
                 {
-                    AssertMetaData(calculationsForTargetProbability.DuneLocationCalculations, expectedDuneLocation, GetExpectedWaterLevel,
+                    AssertMetaData(calculationsForTargetProbability.DuneLocationCalculations, expectedDuneLocation, o => o.WaterLevel,
                                    mapFeature, calculationsForTargetProbability.TargetProbability, "Rekenwaarde h - {0}", presentedMetaDataItems);
 
-                    AssertMetaData(calculationsForTargetProbability.DuneLocationCalculations, expectedDuneLocation, GetExpectedWaveHeight,
+                    AssertMetaData(calculationsForTargetProbability.DuneLocationCalculations, expectedDuneLocation, o => o.WaveHeight,
                                    mapFeature, calculationsForTargetProbability.TargetProbability, "Rekenwaarde Hs - {0}", presentedMetaDataItems);
 
-                    AssertMetaData(calculationsForTargetProbability.DuneLocationCalculations, expectedDuneLocation, GetExpectedWavePeriod,
+                    AssertMetaData(calculationsForTargetProbability.DuneLocationCalculations, expectedDuneLocation, o => o.WavePeriod,
                                    mapFeature, calculationsForTargetProbability.TargetProbability, "Rekenwaarde Tp - {0}", presentedMetaDataItems);
+
+                    AssertMetaData(calculationsForTargetProbability.DuneLocationCalculations, expectedDuneLocation, o => o.MeanTidalAmplitude,
+                                   mapFeature, calculationsForTargetProbability.TargetProbability, "Gemiddelde getijamplitude - {0}", presentedMetaDataItems);
+
+                    AssertMetaData(calculationsForTargetProbability.DuneLocationCalculations, expectedDuneLocation, o => o.WaveDirectionalSpread,
+                                   mapFeature, calculationsForTargetProbability.TargetProbability, "Golfrichtingspreiding - {0}", presentedMetaDataItems);
+
+                    AssertMetaData(calculationsForTargetProbability.DuneLocationCalculations, expectedDuneLocation, o => o.TideSurgePhaseDifference,
+                                   mapFeature, calculationsForTargetProbability.TargetProbability, "Faseverschuiving tussen getij en opzet - {0}", presentedMetaDataItems);
                 }
 
-                int expectedMetaDataCount = 5 + (3 * failureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities.Count);
+                int expectedMetaDataCount = 5 + (6 * failureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities.Count);
                 Assert.AreEqual(expectedMetaDataCount, mapFeature.MetaData.Keys.Count);
             }
         }
 
-        private static void AssertMetaData(IEnumerable<DuneLocationCalculation> calculations, DuneLocation hydraulicBoundaryLocation,
-                                           Func<IEnumerable<DuneLocationCalculation>, DuneLocation, string> getExpectedResultFunc,
+        private static void AssertMetaData(IEnumerable<DuneLocationCalculation> calculations, DuneLocation duneLocation,
+                                           Func<DuneLocationCalculationOutput, RoundedDouble> getOutputPropertyFunc,
                                            MapFeature mapFeature, double targetProbability, string displayNameFormat,
                                            List<string> presentedMetaDataItems)
         {
@@ -101,40 +110,20 @@
                 v => v);
 
             MapFeaturesMetaDataTestHelper.AssertMetaData(
-                getExpectedResultFunc(calculations, hydraulicBoundaryLocation),
+                GetExpectedOutputPropertyResult(calculations, duneLocation, getOutputPropertyFunc),
                 mapFeature, uniqueName);
 
             presentedMetaDataItems.Add(uniqueName);
         }
 
-        private static string GetExpectedWaterLevel(IEnumerable<DuneLocationCalculation> calculations,
-                                                    DuneLocation duneLocation)
+        private static string GetExpectedOutputPropertyResult(IEnumerable<DuneLocationCalculation> calculations,
+                                                              DuneLocation duneLocation,
+                                                              Func<DuneLocationCalculationOutput, RoundedDouble> getOutputPropertyFunc)
         {
-            RoundedDouble result = calculations
-                                   .Single(calculation => calculation.DuneLocation.Equals(duneLocation))
-                                   .Output?.WaterLevel ?? RoundedDouble.NaN;
+            DuneLocationCalculation calculation = calculations.Single(calc => calc.DuneLocation.Equals(duneLocation));
+            RoundedDouble result = calculation.Output == null ? RoundedDouble.NaN : getOutputPropertyFunc(calculation.Output);
 
             return result.ToString();
         }
-
-        private static string GetExpectedWaveHeight(IEnumerable<DuneLocationCalculation> calculations,
-                                                    DuneLocation duneLocation)
-        {
-            RoundedDouble result = calculations
-                                   .Single(calculation => calculation.DuneLocation.Equals(duneLocation))
-                                   .Output?.WaveHeight ?? RoundedDouble.NaN;
-
-            return result.ToString();
-        }
-
-        private static string GetExpectedWavePeriod(IEnumerable<DuneLocationCalculation> calculations,
-                                                    DuneLocation duneLocation)
-        {
-            RoundedDouble result = calculations
-                                   .Single(calculation => calculation.DuneLocation.Equals(duneLocation))
-                                   .Output?.WavePeriod ?? RoundedDouble.NaN;
-
-            return result.ToString();
-        }
     }
 }
\ No newline at end of file