diff --git a/data/fields/boat.json b/data/fields/boat.json
new file mode 100644
index 00000000..30f994c7
--- /dev/null
+++ b/data/fields/boat.json
@@ -0,0 +1,5 @@
+{
+    "key": "boat",
+    "type": "combo",
+    "label": "Boat Access"
+}
diff --git a/data/fields/camping.json b/data/fields/camping.json
new file mode 100644
index 00000000..54cef71b
--- /dev/null
+++ b/data/fields/camping.json
@@ -0,0 +1,5 @@
+{
+    "key": "camping",
+    "type": "combo",
+    "label": "Camping"
+}
diff --git a/data/fields/canoe.json b/data/fields/canoe.json
new file mode 100644
index 00000000..9c8cac86
--- /dev/null
+++ b/data/fields/canoe.json
@@ -0,0 +1,5 @@
+{
+    "key": "canoe",
+    "type": "combo",
+    "label": "Canoe Access"
+}
diff --git a/data/fields/motorboat.json b/data/fields/motorboat.json
new file mode 100644
index 00000000..52dc8235
--- /dev/null
+++ b/data/fields/motorboat.json
@@ -0,0 +1,5 @@
+{
+    "key": "motorboat",
+    "type": "combo",
+    "label": "Motorboat Access"
+}
diff --git a/data/fields/snowmobile.json b/data/fields/snowmobile.json
new file mode 100644
index 00000000..6ff65adf
--- /dev/null
+++ b/data/fields/snowmobile.json
@@ -0,0 +1,8 @@
+{
+    "key": "snowmobile",
+    "type": "combo",
+    "label": "Snowmobile Access",
+    "terms": [
+        "ski-doo"
+    ]
+}
diff --git a/data/fields/swimming.json b/data/fields/swimming.json
new file mode 100644
index 00000000..c462d2d2
--- /dev/null
+++ b/data/fields/swimming.json
@@ -0,0 +1,5 @@
+{
+    "key": "swimming",
+    "type": "combo",
+    "label": "Swimming"
+}
diff --git a/data/fields/trailer.json b/data/fields/trailer.json
new file mode 100644
index 00000000..b3a1f493
--- /dev/null
+++ b/data/fields/trailer.json
@@ -0,0 +1,5 @@
+{
+    "key": "trailer",
+    "type": "combo",
+    "label": "Trailer Access"
+}
diff --git a/data/presets/leisure/slipway.json b/data/presets/leisure/slipway.json
index 9655f7fd..f0540845 100644
--- a/data/presets/leisure/slipway.json
+++ b/data/presets/leisure/slipway.json
@@ -2,16 +2,41 @@
     "icon": "maki-slipway",
     "fields": [
         "name",
+        "operator",
         "surface",
         "access_simple",
+        "canoe",
+        "trailer",
         "fee",
         "payment_multi_fee",
-        "charge_fee"
+        "charge_fee",
+        "tidal"
     ],
     "moreFields": [
+        "address",
+        "bin",
+        "boat",
+        "camping",
+        "covered",
+        "dog",
+        "drinking_water_available",
+        "fishing",
+        "gnis/feature_id-US",
+        "group_only",
+        "intermittent",
         "lit",
+        "motorboat",
         "opening_hours",
+        "picnic_table",
+        "reservation",
         "seamark/type",
+        "seasonal",
+        "shower",
+        "snowmobile",
+        "swimming",
+        "toilets",
+        "trailer",
+        "wheelchair",
         "width"
     ],
     "geometry": [
diff --git a/data/presets/waterway/access_point.json b/data/presets/waterway/access_point.json
new file mode 100644
index 00000000..c226083d
--- /dev/null
+++ b/data/presets/waterway/access_point.json
@@ -0,0 +1,27 @@
+{
+    "fields": [
+        "{leisure/slipway}"
+    ],
+    "moreFields": [
+        "{leisure/slipway}",
+        "informal"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "terms": [
+        "boat",
+        "canoe",
+        "kayak",
+        "launch",
+        "paddleboard",
+        "portage",
+        "put-in",
+        "rowboat",
+        "take-out"
+    ],
+    "tags": {
+        "waterway": "access_point"
+    },
+    "name": "Waterway Access Point"
+}