diff --git a/csv2bufr/templates/resources/aws-template.json b/csv2bufr/templates/resources/aws-template.json
index d286b03..dcc046a 100644
--- a/csv2bufr/templates/resources/aws-template.json
+++ b/csv2bufr/templates/resources/aws-template.json
@@ -25,58 +25,58 @@
         {"eccodes_key": "unexpandedDescriptors", "value":"array:301150, 307096"}
     ],
     "data": [
-        {"eccodes_key": "#1#wigosIdentifierSeries", "value":"data:wsi_series"},
-        {"eccodes_key": "#1#wigosIssuerOfIdentifier", "value":"data:wsi_issuer"},
-        {"eccodes_key": "#1#wigosIssueNumber", "value":"data:wsi_issue_number"},
+        {"eccodes_key": "#1#wigosIdentifierSeries", "value":"data:wsi_series", "valid_min": "const:0", "valid_max": "const:0"},
+        {"eccodes_key": "#1#wigosIssuerOfIdentifier", "value":"data:wsi_issuer", "valid_min": "const:0", "valid_max": "const:65534"},
+        {"eccodes_key": "#1#wigosIssueNumber", "value":"data:wsi_issue_number", "valid_min": "const:0", "valid_max": "const:65534"},
         {"eccodes_key": "#1#wigosLocalIdentifierCharacter", "value":"data:wsi_local"},
-        {"eccodes_key": "#1#latitude", "value": "data:latitude"},
-        {"eccodes_key": "#1#longitude", "value": "data:longitude"},
-        {"eccodes_key": "#1#heightOfStationGroundAboveMeanSeaLevel", "value":"data:station_height_above_msl"},
-        {"eccodes_key": "#1#heightOfBarometerAboveMeanSeaLevel", "value":"data:barometer_height_above_msl"},
-        {"eccodes_key": "#1#blockNumber", "value": "data:wmo_block_number"},
-        {"eccodes_key": "#1#stationNumber", "value": "data:wmo_station_number"},
-        {"eccodes_key": "#1#stationType", "value": "data:station_type"},
-        {"eccodes_key": "#1#year", "value": "data:year"},
-        {"eccodes_key": "#1#month", "value": "data:month"},
-        {"eccodes_key": "#1#day", "value": "data:day"},
-        {"eccodes_key": "#1#hour", "value": "const:0", "valid_min": "const:10"},
-        {"eccodes_key": "#1#minute", "value": "data:minute"},
-        {"eccodes_key": "#1#nonCoordinatePressure", "value": "data:station_pressure"},
-        {"eccodes_key": "#1#pressureReducedToMeanSeaLevel", "value": "data:msl_pressure"},
-        {"eccodes_key": "#1#nonCoordinateGeopotentialHeight", "value": "data:geopotential_height"},
-        {"eccodes_key": "#1#heightOfSensorAboveLocalGroundOrDeckOfMarinePlatform", "value": "data:thermometer_height"},
-        {"eccodes_key": "#1#airTemperature", "value": "data:air_temperature"},
-        {"eccodes_key": "#1#dewpointTemperature", "value": "data:dewpoint_temperature"},
-        {"eccodes_key": "#1#relativeHumidity", "value": "data:relative_humidity"},
-        {"eccodes_key": "#1#methodOfStateOfGroundMeasurement", "value": "data:method_of_ground_state_measurement"},
-        {"eccodes_key": "#1#stateOfGround", "value": "data:ground_state"},
-        {"eccodes_key": "#1#methodOfSnowDepthMeasurement", "value": "data:method_of_snow_depth_measurement"},
-        {"eccodes_key": "#1#totalSnowDepth", "value": "data:snow_depth"},
-        {"eccodes_key": "#1#precipitationIntensityHighAccuracy", "value": "data:precipitation_intensity"},
-        {"eccodes_key": "#8#heightOfSensorAboveLocalGroundOrDeckOfMarinePlatform", "value": "data:anemometer_height"},
-        {"eccodes_key": "#3#timeSignificance", "value": "const:2"},
-        {"eccodes_key": "#6#timePeriod", "value": "data:time_period_of_wind"},
-        {"eccodes_key": "#1#windDirection", "value": "data:wind_direction"},
-        {"eccodes_key": "#1#windSpeed", "value": "data:wind_speed"},
-        {"eccodes_key": "#7#timePeriod", "value": "const:-10"},
-        {"eccodes_key": "#1#maximumWindGustDirection", "value": "data:maximum_wind_gust_direction_10_minutes"},
-        {"eccodes_key": "#1#maximumWindGustSpeed", "value": "data:maximum_wind_gust_speed_10_minutes"},
-        {"eccodes_key": "#8#timePeriod", "value": "const:-60"},
-        {"eccodes_key": "#2#maximumWindGustDirection", "value": "data:maximum_wind_gust_direction_1_hour"},
-        {"eccodes_key": "#2#maximumWindGustSpeed", "value": "data:maximum_wind_gust_speed_1_hour"},
-        {"eccodes_key": "#9#timePeriod", "value": "const:-180"},
-        {"eccodes_key": "#3#maximumWindGustDirection", "value": "data:maximum_wind_gust_direction_3_hours"},
-        {"eccodes_key": "#3#maximumWindGustSpeed", "value": "data:maximum_wind_gust_speed_3_hours"},
-        {"eccodes_key": "#8#heightOfSensorAboveLocalGroundOrDeckOfMarinePlatform", "value": "data:rain_sensor_height"},
-        {"eccodes_key": "#17#timePeriod", "value": "const:-1"},
-        {"eccodes_key": "#1#totalPrecipitationOrTotalWaterEquivalent", "value": "data:total_precipitation_1_hour"},
-        {"eccodes_key": "#18#timePeriod", "value": "const:-3"},
-        {"eccodes_key": "#2#totalPrecipitationOrTotalWaterEquivalent", "value": "data:total_precipitation_3_hours"},
-        {"eccodes_key": "#19#timePeriod", "value": "const:-6"},
-        {"eccodes_key": "#3#totalPrecipitationOrTotalWaterEquivalent", "value": "data:total_precipitation_6_hours"},
-        {"eccodes_key": "#20#timePeriod", "value": "const:-12"},
-        {"eccodes_key": "#4#totalPrecipitationOrTotalWaterEquivalent", "value": "data:total_precipitation_12_hours"},
-        {"eccodes_key": "#21#timePeriod", "value": "const:-24"},
-        {"eccodes_key": "#5#totalPrecipitationOrTotalWaterEquivalent", "value": "data:total_precipitation_24_hours"}
+        {"eccodes_key": "#1#latitude", "value": "data:latitude", "valid_min": "const:-90.0", "valid_max": "const:90.0"},
+        {"eccodes_key": "#1#longitude", "value": "data:longitude", "valid_min": "const:-180.0", "valid_max": "const:180.0"},
+        {"eccodes_key": "#1#heightOfStationGroundAboveMeanSeaLevel", "value":"data:station_height_above_msl", "valid_min": "const:-500", "valid_max": "const:9000"},
+        {"eccodes_key": "#1#heightOfBarometerAboveMeanSeaLevel", "value":"data:barometer_height_above_msl", "valid_min": "const:-500", "valid_max": "const:9000"},
+        {"eccodes_key": "#1#blockNumber", "value": "data:wmo_block_number", "valid_min": "const:0", "valid_max": "const:99"},
+        {"eccodes_key": "#1#stationNumber", "value": "data:wmo_station_number", "valid_min": "const:0", "valid_max": "const:999"},
+        {"eccodes_key": "#1#stationType", "value": "data:station_type", "valid_min": "const:0", "valid_max": "const:3"},
+        {"eccodes_key": "#1#year", "value": "data:year", "valid_min": "const:1600", "valid_max": "const:2200"},
+        {"eccodes_key": "#1#month", "value": "data:month", "valid_min": "const:1", "valid_max": "const:12"},
+        {"eccodes_key": "#1#day", "value": "data:day", "valid_min": "const:1", "valid_max": "const:31"},
+        {"eccodes_key": "#1#hour", "value": "data:hour", "valid_min": "const:0", "valid_max": "const:23"},
+        {"eccodes_key": "#1#minute", "value": "data:minute", "valid_min": "const:0", "valid_max": "const:59"},
+        {"eccodes_key": "#1#nonCoordinatePressure", "value": "data:station_pressure", "valid_min": "const:50000", "valid_max": "const:150000"},
+        {"eccodes_key": "#1#pressureReducedToMeanSeaLevel", "value": "data:msl_pressure", "valid_min": "const:50000", "valid_max": "const:150000"},
+        {"eccodes_key": "#1#nonCoordinateGeopotentialHeight", "value": "data:geopotential_height", "valid_min": "const:-4000", "valid_max": "const:1306710"},
+        {"eccodes_key": "#1#heightOfSensorAboveLocalGroundOrDeckOfMarinePlatform", "value": "data:thermometer_height", "valid_min": "const:0", "valid_max": "const:655.35"},
+        {"eccodes_key": "#1#airTemperature", "value": "data:air_temperature", "valid_min": "const:193.15", "valid_max": "const:333.15"},
+        {"eccodes_key": "#1#dewpointTemperature", "value": "data:dewpoint_temperature", "valid_min": "const:193.15", "valid_max": "const:308.15"},
+        {"eccodes_key": "#1#relativeHumidity", "value": "data:relative_humidity", "valid_min": "const:0", "valid_max": "const:150"},
+        {"eccodes_key": "#1#methodOfStateOfGroundMeasurement", "value": "data:method_of_ground_state_measurement", "valid_min": "const:0", "valid_max": "const:15"},
+        {"eccodes_key": "#1#stateOfGround", "value": "data:ground_state", "valid_min": "const:0", "valid_max": "const:31"},
+        {"eccodes_key": "#1#methodOfSnowDepthMeasurement", "value": "data:method_of_snow_depth_measurement", "valid_min": "const:0", "valid_max": "const:15"},
+        {"eccodes_key": "#1#totalSnowDepth", "value": "data:snow_depth", "valid_min": "const:-0.02", "valid_max": "const:655.33"},
+        {"eccodes_key": "#1#precipitationIntensityHighAccuracy", "value": "data:precipitation_intensity", "valid_min": "const:-0.00001", "valid_max": "const:0.65534"},
+        {"eccodes_key": "#8#heightOfSensorAboveLocalGroundOrDeckOfMarinePlatform", "value": "data:anemometer_height", "valid_min": "const:0", "valid_max": "const:655.35"},
+        {"eccodes_key": "#3#timeSignificance", "value": "const:2", "valid_min": "const:0", "valid_max": "const:0"},
+        {"eccodes_key": "#6#timePeriod", "value": "data:time_period_of_wind", "valid_min": "const:-10", "valid_max": "const:0"},
+        {"eccodes_key": "#1#windDirection", "value": "data:wind_direction", "valid_min": "const:0", "valid_max": "const:360"},
+        {"eccodes_key": "#1#windSpeed", "value": "data:wind_speed", "valid_min": "const:0", "valid_max": "const:409.5"},
+        {"eccodes_key": "#7#timePeriod", "value": "const:-10", "valid_min": "const:-10", "valid_max": "const:-10"},
+        {"eccodes_key": "#1#maximumWindGustDirection", "value": "data:maximum_wind_gust_direction_10_minutes", "valid_min": "const:0", "valid_max": "const:360"},
+        {"eccodes_key": "#1#maximumWindGustSpeed", "value": "data:maximum_wind_gust_speed_10_minutes", "valid_min": "const:0", "valid_max": "const:409.5"},
+        {"eccodes_key": "#8#timePeriod", "value": "const:-60", "valid_min": "const:-60", "valid_max": "const:-60"},
+        {"eccodes_key": "#2#maximumWindGustDirection", "value": "data:maximum_wind_gust_direction_1_hour", "valid_min": "const:0", "valid_max": "const:360"},
+        {"eccodes_key": "#2#maximumWindGustSpeed", "value": "data:maximum_wind_gust_speed_1_hour", "valid_min": "const:0", "valid_max": "const:409.5"},
+        {"eccodes_key": "#9#timePeriod", "value": "const:-180", "valid_min": "const:-180", "valid_max": "const:-180"},
+        {"eccodes_key": "#3#maximumWindGustDirection", "value": "data:maximum_wind_gust_direction_3_hours", "valid_min": "const:0", "valid_max": "const:360"},
+        {"eccodes_key": "#3#maximumWindGustSpeed", "value": "data:maximum_wind_gust_speed_3_hours", "valid_min": "const:0", "valid_max": "const:409.5"},
+        {"eccodes_key": "#8#heightOfSensorAboveLocalGroundOrDeckOfMarinePlatform", "value": "data:rain_sensor_height", "valid_min": "const:0", "valid_max": "const:655.35"},
+        {"eccodes_key": "#17#timePeriod", "value": "const:-1", "valid_min": "const:-1", "valid_max": "const:-1"},
+        {"eccodes_key": "#1#totalPrecipitationOrTotalWaterEquivalent", "value": "data:total_precipitation_1_hour", "valid_min": "const:-0.1", "valid_max": "const:1638.2"},
+        {"eccodes_key": "#18#timePeriod", "value": "const:-3", "valid_min": "const:0", "valid_max": "const:0"},
+        {"eccodes_key": "#2#totalPrecipitationOrTotalWaterEquivalent", "value": "data:total_precipitation_3_hours", "valid_min": "const:-0.1", "valid_max": "const:1638.2"},
+        {"eccodes_key": "#19#timePeriod", "value": "const:-6", "valid_min": "const:0", "valid_max": "const:0"},
+        {"eccodes_key": "#3#totalPrecipitationOrTotalWaterEquivalent", "value": "data:total_precipitation_6_hours", "valid_min": "const:-0.1", "valid_max": "const:1638.2"},
+        {"eccodes_key": "#20#timePeriod", "value": "const:-12", "valid_min": "const:0", "valid_max": "const:0"},
+        {"eccodes_key": "#4#totalPrecipitationOrTotalWaterEquivalent", "value": "data:total_precipitation_12_hours", "valid_min": "const:-0.1", "valid_max": "const:1638.2"},
+        {"eccodes_key": "#21#timePeriod", "value": "const:-24", "valid_min": "const:0", "valid_max": "const:0"},
+        {"eccodes_key": "#5#totalPrecipitationOrTotalWaterEquivalent", "value": "data:total_precipitation_24_hours", "valid_min": "const:-0.1", "valid_max": "const:1638.2"}
     ]
 }
\ No newline at end of file