diff --git a/lib/payload.json b/lib/payload.json
index 428f4c3d61..ca3a958036 100644
--- a/lib/payload.json
+++ b/lib/payload.json
@@ -128,7 +128,11 @@
           "type": "object",
           "properties": {
             "speed": {
-              "description": "Wind speed (m/s)",
+              "description": "Instantaneous or average wind speed (m/s)",
+              "$ref": "#/definitions/speed"
+            },
+            "gustSpeed": {
+              "description": "Maximum wind speed during the measurement interval (m/s)",
               "$ref": "#/definitions/speed"
             },
             "direction": {
@@ -137,6 +141,28 @@
             }
           },
           "additionalProperties": false
+        },
+        "water": {
+          "type": "object",
+          "properties": {
+            "depth": {
+              "description": "Depth of water measurement (cm)",
+              "$ref": "#/definitions/depth"
+            },
+            "temperature": {
+              "description": "Water temperature (°C)",
+              "$ref": "#/definitions/temperature"
+            },
+            "pH": {
+              "description": "Water pH level",
+              "$ref": "#/definitions/pH"
+            },
+            "salinity": {
+              "description": "Salt (mg) per litre (ppm)",
+              "$ref": "#/definitions/concentration"
+            }
+          },
+          "additionalProperties": false
         }
       },
       "additionalProperties": false