diff --git a/data/fields/drinking_water_available.json b/data/fields/drinking_water_available.json
new file mode 100644
index 00000000..f0f20ccf
--- /dev/null
+++ b/data/fields/drinking_water_available.json
@@ -0,0 +1,9 @@
+{
+    "key": "drinking_water",
+    "type": "check",
+    "label": "Drinking Water Available",
+    "terms": [
+        "drinkworthy",
+        "potable"
+    ]
+}
diff --git a/data/fields/kitchen.json b/data/fields/kitchen.json
new file mode 100644
index 00000000..3be31c25
--- /dev/null
+++ b/data/fields/kitchen.json
@@ -0,0 +1,5 @@
+{
+    "key": "kitchen",
+    "type": "check",
+    "label": "Kitchen"
+}
diff --git a/data/fields/mattress.json b/data/fields/mattress.json
new file mode 100644
index 00000000..bc8a5145
--- /dev/null
+++ b/data/fields/mattress.json
@@ -0,0 +1,5 @@
+{
+    "key": "mattress",
+    "type": "check",
+    "label": "Mattresses Available"
+}
diff --git a/data/presets/tourism/camp_site.json b/data/presets/tourism/camp_site.json
index 74a252ce..f5377149 100644
--- a/data/presets/tourism/camp_site.json
+++ b/data/presets/tourism/camp_site.json
@@ -15,7 +15,7 @@
     "moreFields": [
         "backcountry",
         "dog",
-        "drinking_water",
+        "drinking_water_available",
         "email",
         "fax",
         "gnis/feature_id-US",
diff --git a/data/presets/tourism/wilderness_hut.json b/data/presets/tourism/wilderness_hut.json
index f1a6cb0f..d935bbe6 100644
--- a/data/presets/tourism/wilderness_hut.json
+++ b/data/presets/tourism/wilderness_hut.json
@@ -3,18 +3,23 @@
     "fields": [
         "name",
         "operator",
-        "address",
         "building_area",
+        "access_simple",
         "fee",
         "payment_multi_fee",
         "charge_fee",
         "fireplace"
     ],
     "moreFields": [
+        "address",
+        "capacity",
+        "drinking_water_available",
         "gnis/feature_id-US",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "kitchen",
+        "mattress",
         "reservation",
         "wheelchair"
     ],
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 16c57faf..8b301922 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -1079,6 +1079,11 @@ en:
         label: Drinkable
         # 'terms: drinkworthy,potable'
         terms: '[translate with synonyms or related terms for ''Drinkable'', separated by commas]'
+      drinking_water_available:
+        # drinking_water=*
+        label: Drinking Water Available
+        # 'terms: drinkworthy,potable'
+        terms: '[translate with synonyms or related terms for ''Drinking Water Available'', separated by commas]'
       drive_through:
         # drive_through=*
         label: Drive-Through
@@ -1607,6 +1612,10 @@ en:
       kerb/height:
         # kerb:height=*
         label: Height
+      kitchen:
+        # kitchen=*
+        label: Kitchen
+        terms: '[translate with synonyms or related terms for ''Kitchen'', separated by commas]'
       kneipp_water_cure_multi:
         # kneipp_water_cure:=*
         label: Basin Types
@@ -1779,6 +1788,10 @@ en:
         # material=*
         label: Material
         terms: '[translate with synonyms or related terms for ''Material'', separated by commas]'
+      mattress:
+        # mattress=*
+        label: Mattresses Available
+        terms: '[translate with synonyms or related terms for ''Mattresses Available'', separated by commas]'
       max_age:
         # max_age=*
         label: Maximum Age