diff --git a/data/fields/count.json b/data/fields/count.json
new file mode 100644
index 00000000..fab95598
--- /dev/null
+++ b/data/fields/count.json
@@ -0,0 +1,6 @@
+{
+    "key": "count",
+    "type": "number",
+    "minValue": 1,
+    "label": "Number of Features"
+}
diff --git a/data/fields/footrest.json b/data/fields/footrest.json
new file mode 100644
index 00000000..f00c954a
--- /dev/null
+++ b/data/fields/footrest.json
@@ -0,0 +1,5 @@
+{
+    "key": "footrest",
+    "type": "check",
+    "label": "Footrest"
+}
diff --git a/data/fields/handrest.json b/data/fields/handrest.json
new file mode 100644
index 00000000..c92cba82
--- /dev/null
+++ b/data/fields/handrest.json
@@ -0,0 +1,6 @@
+{
+    "key": "handrest",
+    "type": "check",
+    "label": "Handrest",
+    "default": "yes"
+}
diff --git a/data/fields/side.json b/data/fields/side.json
new file mode 100644
index 00000000..78c8aa2e
--- /dev/null
+++ b/data/fields/side.json
@@ -0,0 +1,12 @@
+{
+    "key": "side",
+    "type": "combo",
+    "label": "Side",
+    "strings": {
+        "options": {
+            "left": "Left",
+            "right": "Right"
+        }
+    },
+    "autoSuggestions": false
+}
diff --git a/data/presets/highway/cyclist_waiting_aid.json b/data/presets/highway/cyclist_waiting_aid.json
new file mode 100644
index 00000000..c3451728
--- /dev/null
+++ b/data/presets/highway/cyclist_waiting_aid.json
@@ -0,0 +1,31 @@
+{
+    "name": "Cyclist Waiting Aid",
+    "icon": "temaki-guard_rail",
+    "fields": [
+        "footrest",
+        "handrest",
+        "direction_vertex",
+        "side",
+        "count"
+    ],
+    "moreFields": [
+        "capacity"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "cyclist_waiting_aid"
+    },
+    "terms": [
+        "foot rail",
+        "footrail",
+        "footrest",
+        "grip",
+        "hand rail",
+        "handle",
+        "handrail",
+        "handrest",
+        "holding rail"
+    ]
+}