diff --git a/data/fields/pipeline.json b/data/fields/pipeline.json
new file mode 100644
index 00000000..4d1d1055
--- /dev/null
+++ b/data/fields/pipeline.json
@@ -0,0 +1,5 @@
+{
+    "key": "pipeline",
+    "type": "typeCombo",
+    "label": "Type"
+}
diff --git a/data/fields/substation_pipeline.json b/data/fields/substation_pipeline.json
new file mode 100644
index 00000000..a0d31440
--- /dev/null
+++ b/data/fields/substation_pipeline.json
@@ -0,0 +1,20 @@
+{
+    "key": "substation",
+    "type": "typeCombo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "transmission": "Transmission",
+            "distribution": "Regional Distribution",
+            "minor_distribution": "Local Distribution",
+            "industrial": "Industrial",
+            "compression": "Compression",
+            "measurement": "Measurement",
+            "valve": "Valve",
+            "valve_group": "Valve Group",
+            "inspection_gauge": "Inspection Gauge",
+            "field_gathering": "Field Gathering"
+        }
+    },
+    "autoSuggestions": false
+}
diff --git a/data/presets/_pipeline.json b/data/presets/_pipeline.json
new file mode 100644
index 00000000..d379c09a
--- /dev/null
+++ b/data/presets/_pipeline.json
@@ -0,0 +1,18 @@
+{
+    "icon": "iD-pipeline-line",
+    "fields": [
+        "pipeline",
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "natural": "*"
+    },
+    "searchable": false,
+    "name": "Pipeline Feature"
+}
diff --git a/data/presets/pipeline/substation.json b/data/presets/pipeline/substation.json
new file mode 100644
index 00000000..0866df57
--- /dev/null
+++ b/data/presets/pipeline/substation.json
@@ -0,0 +1,22 @@
+{
+    "icon": "temaki-powered_pump",
+    "fields": [
+        "name",
+        "substation_pipeline",
+        "operator",
+        "building",
+        "substance",
+        "ref"
+    ],
+    "moreFields": [
+        "address"
+    ],
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "tags": {
+        "pipeline": "substation"
+    },
+    "name": "Pipeline Substation"
+}
diff --git a/data/presets/man_made/pipeline/valve.json b/data/presets/pipeline/valve.json
similarity index 100%
rename from data/presets/man_made/pipeline/valve.json
rename to data/presets/pipeline/valve.json