diff --git a/data/fields/cycle_barrier.json b/data/fields/cycle_barrier.json
new file mode 100644
index 00000000..cff7a66f
--- /dev/null
+++ b/data/fields/cycle_barrier.json
@@ -0,0 +1,16 @@
+{
+    "key": "cycle_barrier",
+    "type": "combo",
+    "label": "Type",
+    "customValues": false,
+    "autoSuggestions": false,
+    "strings": {
+        "options": {
+            "single": "Single",
+            "double": "Double",
+            "triple": "Triple",
+            "diagonal": "Diagonal",
+            "tilted": "Tilted"
+        }
+    }
+}
diff --git a/data/fields/cycle_barrier/installation.json b/data/fields/cycle_barrier/installation.json
new file mode 100644
index 00000000..577f7292
--- /dev/null
+++ b/data/fields/cycle_barrier/installation.json
@@ -0,0 +1,14 @@
+{
+    "key": "cycle_barrier:installation",
+    "type": "combo",
+    "label": "Installation",
+    "customValues": false,
+    "autoSuggestions": false,
+    "strings": {
+        "options": {
+            "fixed": "Fixed",
+            "openable": "Openable",
+            "removable": "Removable"
+        }
+    }
+}
diff --git a/data/fields/deflection.json b/data/fields/deflection.json
new file mode 100644
index 00000000..7a591808
--- /dev/null
+++ b/data/fields/deflection.json
@@ -0,0 +1,10 @@
+{
+    "key": "deflection",
+    "type": "number",
+    "label": "Angle",
+    "increment": 5,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "value": "diagonal"
+    }
+}
diff --git a/data/fields/maxwidth/physical.json b/data/fields/maxwidth/physical.json
new file mode 100644
index 00000000..d8e20dc4
--- /dev/null
+++ b/data/fields/maxwidth/physical.json
@@ -0,0 +1,6 @@
+{
+    "key": "maxwidth:physical",
+    "type": "roadheight",
+    "label": "Width Limit",
+    "snake_case": false
+}
diff --git a/data/fields/opening.json b/data/fields/opening.json
new file mode 100644
index 00000000..4e8da3c9
--- /dev/null
+++ b/data/fields/opening.json
@@ -0,0 +1,10 @@
+{
+    "key": "opening",
+    "type": "number",
+    "label": "Opening Width (Meters)",
+    "snake_case": false,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "valueNot": "single"
+    }
+}
diff --git a/data/fields/overlap.json b/data/fields/overlap.json
new file mode 100644
index 00000000..f07d3cf4
--- /dev/null
+++ b/data/fields/overlap.json
@@ -0,0 +1,10 @@
+{
+    "key": "overlap",
+    "type": "number",
+    "label": "Overlap Width (Meters)",
+    "snake_case": false,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "valueNot": "single"
+    }
+}
diff --git a/data/fields/spacing.json b/data/fields/spacing.json
new file mode 100644
index 00000000..1e56e3ac
--- /dev/null
+++ b/data/fields/spacing.json
@@ -0,0 +1,10 @@
+{
+    "key": "spacing",
+    "type": "number",
+    "label": "Distance Between Barriers (Meters)",
+    "snake_case": false,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "valueNot": "single"
+    }
+}
diff --git a/data/presets/barrier/cycle_barrier.json b/data/presets/barrier/cycle_barrier.json
index f05935d7..cbfb6231 100644
--- a/data/presets/barrier/cycle_barrier.json
+++ b/data/presets/barrier/cycle_barrier.json
@@ -1,7 +1,17 @@
 {
     "icon": "temaki-cycle_barrier",
     "fields": [
-        "access"
+        "access",
+        "wheelchair",
+        "cycle_barrier",
+        "maxwidth/physical",
+        "opening",
+        "spacing",
+        "overlap",
+        "deflection"
+    ],
+    "moreFields": [
+        "cycle_barrier/installation"
     ],
     "geometry": [
         "vertex"
@@ -10,6 +20,9 @@
         "barrier": "cycle_barrier"
     },
     "terms": [
+        "chicane",
+        "bike chicane",
+        "bike barrier",
         "bicycle barrier",
         "bicycling barrier",
         "bike gates",