diff --git a/data/fields/license_classes.json b/data/fields/license_classes.json
new file mode 100644
index 00000000..737fd7c8
--- /dev/null
+++ b/data/fields/license_classes.json
@@ -0,0 +1,5 @@
+{
+    "key": "license_classes",
+    "type": "semiCombo",
+    "label": "Driving License Classes"
+}
diff --git a/data/presets/amenity/driver_training.json b/data/presets/amenity/driver_training.json
new file mode 100644
index 00000000..d3d1f32c
--- /dev/null
+++ b/data/presets/amenity/driver_training.json
@@ -0,0 +1,34 @@
+{
+    "icon": "maki-car",
+    "fields": [
+        "name",
+        "operator",
+        "operator/type",
+        "address",
+        "opening_hours"
+    ],
+    "moreFields": [
+        "license_classes",
+        "email",
+        "fax",
+        "opening_hours/covid19",
+        "payment_multi",
+        "phone",
+        "website",
+        "wheelchair"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "driver_training"
+    },
+    "name": "Driver Training Grounds",
+    "aliases": [
+        "Driving Safety Center"
+    ],
+    "terms": [
+        "Driving School"
+    ]
+}
diff --git a/data/presets/amenity/driving_school.json b/data/presets/amenity/driving_school.json
index b5047a9f..b7756936 100644
--- a/data/presets/amenity/driving_school.json
+++ b/data/presets/amenity/driving_school.json
@@ -5,7 +5,7 @@
         "operator",
         "operator/type",
         "address",
-        "building_area_yes",
+        "building_area",
         "opening_hours"
     ],
     "moreFields": [
@@ -13,6 +13,7 @@
         "fax",
         "gnis/feature_id-US",
         "level",
+        "license_classes",
         "opening_hours/covid19",
         "payment_multi",
         "ref/FR/siret-FR",