diff --git a/hydrolib/core/dflowfm/extold/models.py b/hydrolib/core/dflowfm/extold/models.py
index 996280fe7..30836ea3a 100644
--- a/hydrolib/core/dflowfm/extold/models.py
+++ b/hydrolib/core/dflowfm/extold/models.py
@@ -191,7 +191,35 @@ class ExtOldQuantity(str, Enum):
     """Discharge, salinity temperature source-sinks"""
     NudgeSalinityTemperature = "nudge_salinity_temperature"
     """Nudging salinity and temperature"""
-
+    AirPressure = "airpressure"
+    """AirPressure"""
+    StressX = "stressx"
+    """eastward wind stress"""
+    StressY = "stressy"
+    """northward wind stress"""
+    AirTemperature = "airtemperature"
+    """AirTemperature"""
+    Cloudiness = "cloudiness"
+    """Cloudiness, or cloud cover (fraction)"""
+    Humidity = "humidity"
+    """Humidity"""
+    StressXY = "stressxy"
+    """eastward and northward wind stress"""
+    AirpressureStressXStressY = "airpressure_stressx_stressy"
+    """Airpressure, eastward and northward wind stress"""
+    WindSpeed = "wind_speed"
+    """WindSpeed"""
+    WindFromDirection = "wind_from_direction"
+    """WindFromDirection"""
+    DewpointAirTemperatureCloudinessSolarradiation = "dewpoint_airtemperature_cloudiness_solarradiation"
+    """Dewpoint temperature, air temperature, cloudiness, solarradiation"""
+    AirDensity = "airdensity"
+    """Air density"""
+    Charnock = "charnock"
+    """Charnock coefficient"""
+    DewpointTemperature = "dewpointtemperature"
+    """DewpointTemperature"""
+    
     # Structure parameters
     Pump = "pump"
     """Pump capacity"""
@@ -242,27 +270,6 @@ class ExtOldQuantity(str, Enum):
     WavePeriod = "waveperiod"
     """Wave period"""
 
-    # missing quantities from https://git.deltares.nl/oss/delft3d/-/blob/main/src/utils_lgpl/ec_module/packages/ec_module/src/ec_provider.F90#L2478-2615
-    AirPressure = "airpressure"
-    StressX = "stressx"  # eastward wind stress
-    StressY = "stressy"  # northward wind stress
-    AirTemperature = "airtemperature"
-    Cloudiness = "cloudiness"  # cloud cover (fraction)
-    Humidity = "humidity"
-
-    # to be implemented in https://issuetracker.deltares.nl/browse/UNST-6593
-    AirDensity = "airdensity"
-    Charnock = "charnock"
-    Dewpoint = "dewpoint"  # TODO: decide on name
-    # DewpointTemperature = "dewpointtemperature"
-
-    # in same file, but not sure if needed
-    # StressXY = "stressxy"
-    # AirpressureStressXStressY = "airpressure_stressx_stressy"
-    # WindSpeed = "wind_speed"
-    # WindFromDirection = "wind_from_direction"
-    # DewPointAirTemperatureCloudinessSolarradiation = "dewpoint_airtemperature_cloudiness_solarradiation"
-
 
 class ExtOldFileType(IntEnum):
     """Enum class containing the valid values for the `filetype` attribute