diff --git a/catalogs/sources/gtfs/schedule/es-alava-tuvisa-euskotran-gtfs-797.json b/catalogs/sources/gtfs/schedule/es-alava-tuvisa-euskotran-gtfs-797.json
index 16c09b741..3b5d48a97 100644
--- a/catalogs/sources/gtfs/schedule/es-alava-tuvisa-euskotran-gtfs-797.json
+++ b/catalogs/sources/gtfs/schedule/es-alava-tuvisa-euskotran-gtfs-797.json
@@ -1,8 +1,9 @@
 {
     "mdb_source_id": 797,
     "data_type": "gtfs",
-    "provider": "Tuvisa-EuskoTran",
+    "provider": "TUVISA (Transportes Urbanos de Vitoria)",
     "feed_contact_email": "tuvisa@vitoria-gasteiz.org",
+    "is_official": "True",
     "location": {
         "country_code": "ES",
         "subdivision_name": "Álava",
@@ -18,7 +19,8 @@
     "urls": {
         "direct_download": "http://www.vitoria-gasteiz.org/we001/http/vgTransit/google_transit.zip",
         "authentication_type": 0,
-        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/es-alava-tuvisa-euskotran-gtfs-797.zip?alt=media"
+        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/es-alava-tuvisa-euskotran-gtfs-797.zip?alt=media",
+        "license": "https://www.vitoria-gasteiz.org/wb021/was/contenidoAction.do?idioma=es&uid=app_j34_0021"
     },
     "redirect": []
-}
\ No newline at end of file
+}
diff --git a/catalogs/sources/gtfs/schedule/es-alicante-vectalia-movilidad-gtfs-2822.json b/catalogs/sources/gtfs/schedule/es-alicante-vectalia-movilidad-gtfs-2822.json
index f1bbde006..b5e64ecc7 100644
--- a/catalogs/sources/gtfs/schedule/es-alicante-vectalia-movilidad-gtfs-2822.json
+++ b/catalogs/sources/gtfs/schedule/es-alicante-vectalia-movilidad-gtfs-2822.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2822,
     "data_type": "gtfs",
-    "provider": "Vectalia Movilidad (Autobuses urbanos de Alicante)",
+    "provider": "Vectalia Movilidad (Alicante city buses)",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-almeria-autocares-baraza-gtfs-2774.json b/catalogs/sources/gtfs/schedule/es-almeria-autocares-baraza-gtfs-2774.json
index 91e8b7cc1..b62fd2ee7 100644
--- a/catalogs/sources/gtfs/schedule/es-almeria-autocares-baraza-gtfs-2774.json
+++ b/catalogs/sources/gtfs/schedule/es-almeria-autocares-baraza-gtfs-2774.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2774,
     "data_type": "gtfs",
-    "provider": "Autocares Baraza",
+    "provider": "Autocares Baraza (Baraza Coaches)",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-alsa-autobuses-gtfs-2825.json b/catalogs/sources/gtfs/schedule/es-alsa-autobuses-gtfs-2825.json
index aafe19403..4b074cf5f 100644
--- a/catalogs/sources/gtfs/schedule/es-alsa-autobuses-gtfs-2825.json
+++ b/catalogs/sources/gtfs/schedule/es-alsa-autobuses-gtfs-2825.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2825,
     "data_type": "gtfs",
-    "provider": "ALSA autobuses",
+    "provider": "ALSA buses",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-andalucia-transporte-metropolitano-gtfs-2721.json b/catalogs/sources/gtfs/schedule/es-andalucia-transporte-metropolitano-gtfs-2721.json
index 1be04815c..98f9a4808 100644
--- a/catalogs/sources/gtfs/schedule/es-andalucia-transporte-metropolitano-gtfs-2721.json
+++ b/catalogs/sources/gtfs/schedule/es-andalucia-transporte-metropolitano-gtfs-2721.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2721,
     "data_type": "gtfs",
-    "provider": "Red de Consorcios de Transporte Metropolitano de Andalucía",
+    "provider": "Network of Metropolitan Transport Consortiums of Andalusia",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-aragon-la-veloz-gtfs-2808.json b/catalogs/sources/gtfs/schedule/es-aragon-la-veloz-gtfs-2808.json
index f6a5c2bb1..2fa2cdfd6 100644
--- a/catalogs/sources/gtfs/schedule/es-aragon-la-veloz-gtfs-2808.json
+++ b/catalogs/sources/gtfs/schedule/es-aragon-la-veloz-gtfs-2808.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2808,
     "data_type": "gtfs",
-    "provider": "La Veloz, SA (Buses from the Belchite countryside area to Zaragoza (C12))",
+    "provider": "La Veloz SA (Buses from the Belchite countryside area to Zaragoza (C12))",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-alava-tuvisa-gtfs-2831.json b/catalogs/sources/gtfs/schedule/es-atm-autobuses-trains-simplified-gtfs-2832.json
similarity index 73%
rename from catalogs/sources/gtfs/schedule/es-alava-tuvisa-gtfs-2831.json
rename to catalogs/sources/gtfs/schedule/es-atm-autobuses-trains-simplified-gtfs-2832.json
index a23519de7..a24db3f3a 100644
--- a/catalogs/sources/gtfs/schedule/es-alava-tuvisa-gtfs-2831.json
+++ b/catalogs/sources/gtfs/schedule/es-atm-autobuses-trains-simplified-gtfs-2832.json
@@ -1,12 +1,12 @@
 {
-    "mdb_source_id": 2831,
+    "mdb_source_id": 2832,
     "data_type": "gtfs",
-    "provider": "TUVISA (Transportes Urbanos de Vitoria)",
+    "provider": "Autoridad de Transporte Metropolitano del Área de Barcelona (ATM) Buses and trains in Catalonia (simplified version)",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
-        "subdivision_name": "Álava",
+        "subdivision": "Catalonia",
         "bounding_box": {
             "minimum_latitude": null,
             "maximum_latitude": null,
@@ -16,11 +16,11 @@
         }
     },
     "urls": {
-        "direct_download": "https://nap.transportes.gob.es/api/Fichero/download/1271",
+        "direct_download": "https://nap.transportes.gob.es/api/Fichero/download/2059",
         "authentication_type": 2,
         "authentication_info": "https://nap.transportes.gob.es/",
         "api_key_parameter_name": "ApiKey",
-        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/es-alava-tuvisa-gtfs-2831.zip?alt=media",
+        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/es-atm-autobuses-trains-simplified-gtfs-2832.zip?alt=media",
         "license": "https://nap.transportes.gob.es/licencia-datos"
     }
 }
diff --git a/catalogs/sources/gtfs/schedule/es-autobus-pamplona-gtfs-2719.json b/catalogs/sources/gtfs/schedule/es-autobus-pamplona-gtfs-2719.json
index f8171182d..c30d7107a 100644
--- a/catalogs/sources/gtfs/schedule/es-autobus-pamplona-gtfs-2719.json
+++ b/catalogs/sources/gtfs/schedule/es-autobus-pamplona-gtfs-2719.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2719,
     "data_type": "gtfs",
-    "provider": "Autobús Comarca de Pamplona",
+    "provider": "Pamplona Region Bus (TCC Pamplona)",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-autobuses-samar-gtfs-2712.json b/catalogs/sources/gtfs/schedule/es-autobuses-samar-gtfs-2712.json
index 3eb0a2525..b1616ccd8 100644
--- a/catalogs/sources/gtfs/schedule/es-autobuses-samar-gtfs-2712.json
+++ b/catalogs/sources/gtfs/schedule/es-autobuses-samar-gtfs-2712.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2712,
     "data_type": "gtfs",
-    "provider": "Autobuses Samar",
+    "provider": "Samar Buses",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "is_official": "True",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-autocares-rias-baixas-gtfs-2752.json b/catalogs/sources/gtfs/schedule/es-autocares-rias-baixas-gtfs-2752.json
index 87d0eb94a..254f12496 100644
--- a/catalogs/sources/gtfs/schedule/es-autocares-rias-baixas-gtfs-2752.json
+++ b/catalogs/sources/gtfs/schedule/es-autocares-rias-baixas-gtfs-2752.json
@@ -1,7 +1,7 @@
  {
     "mdb_source_id": 2752,
     "data_type": "gtfs",
-    "provider": "Autocares Rías Baixas",
+    "provider": "Autocares Rías Baixas (Rías Baixas Coaches)",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-avila-viagon-gtfs-2786.json b/catalogs/sources/gtfs/schedule/es-avila-viagon-gtfs-2786.json
index 577b38d9e..87c6dbba2 100644
--- a/catalogs/sources/gtfs/schedule/es-avila-viagon-gtfs-2786.json
+++ b/catalogs/sources/gtfs/schedule/es-avila-viagon-gtfs-2786.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2786,
     "data_type": "gtfs",
-    "provider": "Viagón",
+    "provider": "Viagón Coaches",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-barcelona-trambesos-gtfs-1004.json b/catalogs/sources/gtfs/schedule/es-barcelona-trambesos-gtfs-1004.json
index f17588fd8..f03fd9a5b 100644
--- a/catalogs/sources/gtfs/schedule/es-barcelona-trambesos-gtfs-1004.json
+++ b/catalogs/sources/gtfs/schedule/es-barcelona-trambesos-gtfs-1004.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 1004,
     "data_type": "gtfs",
-    "provider": "Trambesòs",
+    "provider": "TRAM Barcelona Besós (Tranvía Metropolitano Barcelona)",
     "is_official": "True",
     "location": {
         "country_code": "ES",
@@ -18,4 +18,4 @@
         "direct_download": "https://opendata.tram.cat/GTFS/zip/TBS.zip",
         "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/es-barcelona-trambesos-gtfs-1004.zip?alt=media"
     }
-}
\ No newline at end of file
+}
diff --git a/catalogs/sources/gtfs/schedule/es-barcelona-transports-metropolitans-de-barcelona-tmb-gtfs-2359.json b/catalogs/sources/gtfs/schedule/es-barcelona-transports-metropolitans-de-barcelona-tmb-gtfs-2359.json
index 2300f7ba4..5c9dbb020 100644
--- a/catalogs/sources/gtfs/schedule/es-barcelona-transports-metropolitans-de-barcelona-tmb-gtfs-2359.json
+++ b/catalogs/sources/gtfs/schedule/es-barcelona-transports-metropolitans-de-barcelona-tmb-gtfs-2359.json
@@ -2,6 +2,7 @@
     "mdb_source_id": 2359,
     "data_type": "gtfs",
     "provider": "Transports Metropolitans de Barcelona (TMB)",
+    "is_official": "True",
     "name": "TMB",
     "location": {
         "country_code": "ES",
@@ -21,4 +22,4 @@
         "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/es-barcelona-transports-metropolitans-de-barcelona-tmb-gtfs-2359.zip?alt=media"
     },
     "redirect": []
-}
\ No newline at end of file
+}
diff --git a/catalogs/sources/gtfs/schedule/es-bizkaia-el-transbordador-de-vizcaya-gtfs-1162.json b/catalogs/sources/gtfs/schedule/es-bizkaia-el-transbordador-de-vizcaya-gtfs-1162.json
index b265a1b76..7f4bdef5c 100644
--- a/catalogs/sources/gtfs/schedule/es-bizkaia-el-transbordador-de-vizcaya-gtfs-1162.json
+++ b/catalogs/sources/gtfs/schedule/es-bizkaia-el-transbordador-de-vizcaya-gtfs-1162.json
@@ -2,6 +2,8 @@
     "mdb_source_id": 1162,
     "data_type": "gtfs",
     "provider": "El Transbordador de Vizcaya",
+    "is_official": "True",
+    "feed_contact_email": "gtfs@addtransit.com",
     "location": {
         "country_code": "ES",
         "subdivision_name": "Bizkaia",
@@ -21,4 +23,4 @@
         "license": "https://creativecommons.org/licenses/by/4.0/"
     },
     "redirect": []
-}
\ No newline at end of file
+}
diff --git a/catalogs/sources/gtfs/schedule/es-bizkaia-funicular-de-artxanda-gtfs-2680.json b/catalogs/sources/gtfs/schedule/es-bizkaia-funicular-de-artxanda-gtfs-2680.json
index 934a571cb..8df0ff3de 100644
--- a/catalogs/sources/gtfs/schedule/es-bizkaia-funicular-de-artxanda-gtfs-2680.json
+++ b/catalogs/sources/gtfs/schedule/es-bizkaia-funicular-de-artxanda-gtfs-2680.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Funicular de Artxanda",
     "is_official": "True",
+    "feed_contact_email": "gtfs@addtransit.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-caceres-autobus-urbano-de-caceres-gtfs-2714.json b/catalogs/sources/gtfs/schedule/es-caceres-autobus-urbano-de-caceres-gtfs-2714.json
index 23736a574..e32281b5f 100644
--- a/catalogs/sources/gtfs/schedule/es-caceres-autobus-urbano-de-caceres-gtfs-2714.json
+++ b/catalogs/sources/gtfs/schedule/es-caceres-autobus-urbano-de-caceres-gtfs-2714.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2714,
     "data_type": "gtfs",
-    "provider": "Vectalia Movilidad (Autobús urbano de Cáceres)",
+    "provider": "Vectalia Movilidad (Cáceres city bus)",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "is_official": "True",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-castile-and-leon-salamanca-grupo-ruiz-gtfs-2823.json b/catalogs/sources/gtfs/schedule/es-castile-and-leon-salamanca-grupo-ruiz-gtfs-2823.json
index f4b6ebbfa..d8e0ac0b6 100644
--- a/catalogs/sources/gtfs/schedule/es-castile-and-leon-salamanca-grupo-ruiz-gtfs-2823.json
+++ b/catalogs/sources/gtfs/schedule/es-castile-and-leon-salamanca-grupo-ruiz-gtfs-2823.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2823,
     "data_type": "gtfs",
-    "provider": "Salamanca de Transportes, S.A. (Grupo Ruiz)",
+    "provider": "Salamanca de Transportes S.A. (Grupo Ruiz)",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-catalonia-eixbus-gtfs-2806.json b/catalogs/sources/gtfs/schedule/es-catalonia-eixbus-gtfs-2806.json
index faa4e79b3..25950c0e2 100644
--- a/catalogs/sources/gtfs/schedule/es-catalonia-eixbus-gtfs-2806.json
+++ b/catalogs/sources/gtfs/schedule/es-catalonia-eixbus-gtfs-2806.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2806,
     "data_type": "gtfs",
-    "provider": "Eixbus, S.At",
+    "provider": "Eixbus S.At",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-catalonia-lledia-autobusos-de-lledia-gtfs-2753.json b/catalogs/sources/gtfs/schedule/es-catalonia-lledia-autobusos-de-lledia-gtfs-2753.json
index b881b5b05..75640192b 100644
--- a/catalogs/sources/gtfs/schedule/es-catalonia-lledia-autobusos-de-lledia-gtfs-2753.json
+++ b/catalogs/sources/gtfs/schedule/es-catalonia-lledia-autobusos-de-lledia-gtfs-2753.json
@@ -1,7 +1,7 @@
  {
     "mdb_source_id": 2753,
     "data_type": "gtfs",
-    "provider": "Autobusos de Lleida",
+    "provider": "Autobusos de Lleida (Lleida buses)",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-catalunya-ferrocarrils-de-la-generalitat-de-catalunya-gtfs-1856.json b/catalogs/sources/gtfs/schedule/es-catalunya-ferrocarrils-de-la-generalitat-de-catalunya-gtfs-1856.json
index 46271d802..5476b4405 100644
--- a/catalogs/sources/gtfs/schedule/es-catalunya-ferrocarrils-de-la-generalitat-de-catalunya-gtfs-1856.json
+++ b/catalogs/sources/gtfs/schedule/es-catalunya-ferrocarrils-de-la-generalitat-de-catalunya-gtfs-1856.json
@@ -1,7 +1,8 @@
 {
     "mdb_source_id": 1856,
     "data_type": "gtfs",
-    "provider": "Ferrocarrils de la Generalitat de Catalunya",
+    "provider": "Railways of the Generalitat of Catalonia (Ferrocarrils de la Generalitat de Catalunya)",
+    "is_official": "True",
     "feed_contact_email": "njimenez@fgc.cat",
     "location": {
         "country_code": "ES",
@@ -21,4 +22,4 @@
         "license": "https://dadesobertes.fgc.cat/explore/?q=gtfs_zip"
     },
     "redirect": []
-}
\ No newline at end of file
+}
diff --git a/catalogs/sources/gtfs/schedule/es-daibus-gtfs-2817.json b/catalogs/sources/gtfs/schedule/es-daibus-gtfs-2817.json
index 339471505..8c1defe0d 100644
--- a/catalogs/sources/gtfs/schedule/es-daibus-gtfs-2817.json
+++ b/catalogs/sources/gtfs/schedule/es-daibus-gtfs-2817.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2817,
     "data_type": "gtfs",
-    "provider": "DAIBUS (VAC-232. Madrid, Malaga, and Algeciras (Cadiz))",
+    "provider": "DAIBUS (VAC-232. Madrid Malaga and Algeciras (Cadiz))",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-extremadura-junta-de-extremadura-gtfs-2690.json b/catalogs/sources/gtfs/schedule/es-extremadura-junta-de-extremadura-gtfs-2690.json
index a74277161..9d1494a0a 100644
--- a/catalogs/sources/gtfs/schedule/es-extremadura-junta-de-extremadura-gtfs-2690.json
+++ b/catalogs/sources/gtfs/schedule/es-extremadura-junta-de-extremadura-gtfs-2690.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2690,
     "data_type": "gtfs",
-    "provider": "Junta de Extremadura",
+    "provider": "Junta de Extremadura (Extremadura Regional Government Buses)",
     "location": {
         "country_code": "ES",
         "subdivision_name": "Extremadura",
diff --git a/catalogs/sources/gtfs/schedule/es-galicia-a-coruna-tram-gtfs-2767.json b/catalogs/sources/gtfs/schedule/es-galicia-a-coruna-tram-gtfs-2767.json
index fae9e8061..8e9dd7a08 100644
--- a/catalogs/sources/gtfs/schedule/es-galicia-a-coruna-tram-gtfs-2767.json
+++ b/catalogs/sources/gtfs/schedule/es-galicia-a-coruna-tram-gtfs-2767.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2767,
     "data_type": "gtfs",
-    "provider": "La Coruña Tram Company, SA",
+    "provider": "La Coruña Tram Company SA",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-gipuzkoa-dbus-gtfs-2682.json b/catalogs/sources/gtfs/schedule/es-gipuzkoa-dbus-gtfs-2682.json
index 61031a03e..80d13770d 100644
--- a/catalogs/sources/gtfs/schedule/es-gipuzkoa-dbus-gtfs-2682.json
+++ b/catalogs/sources/gtfs/schedule/es-gipuzkoa-dbus-gtfs-2682.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "dBus (Donostiabus)",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-eibar-gtfs-2735.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-eibar-gtfs-2735.json
index f5746db1b..ca6b6d2af 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-eibar-gtfs-2735.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-eibar-gtfs-2735.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Lurraldebus Eibar",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-ekialdebus-gtfs-2731.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-ekialdebus-gtfs-2731.json
index c7b607f72..c4508cab2 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-ekialdebus-gtfs-2731.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-ekialdebus-gtfs-2731.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Lurraldebus Ekialdebus",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-goierrialdea-gtfs-2732.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-goierrialdea-gtfs-2732.json
index c9820134d..95b45b90b 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-goierrialdea-gtfs-2732.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-goierrialdea-gtfs-2732.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Lurraldebus Goierrialdea",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-hernani-hernaniko-hiribusa-gtfs-2734.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-hernani-hernaniko-hiribusa-gtfs-2734.json
index 242c15ebb..61b49d5eb 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-hernani-hernaniko-hiribusa-gtfs-2734.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-hernani-hernaniko-hiribusa-gtfs-2734.json
@@ -1,8 +1,9 @@
 {
     "mdb_source_id": 2734,
     "data_type": "gtfs",
-    "provider": "Hernani Urban (Hernaniko hiribusa)",
+    "provider": "Lurraldebus - Hernani Urban (Hernani city bus)",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-irun-auif-irunbus-gtfs-2724.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-irun-auif-irunbus-gtfs-2724.json
index 120520ab7..591ec1b25 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-irun-auif-irunbus-gtfs-2724.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-irun-auif-irunbus-gtfs-2724.json
@@ -1,8 +1,9 @@
 {
     "mdb_source_id": 2724,
     "data_type": "gtfs",
-    "provider": "Auif Irunbus",
+    "provider": "Auif Irunbus (Lurraldebus)",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-lurraldebus-gtfs-2728.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-lurraldebus-gtfs-2728.json
index c264da69f..e0377475d 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-lurraldebus-gtfs-2728.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-lurraldebus-gtfs-2728.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Lurraldebus Zarautz",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-lurraldebus-gtfs-2736.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-lurraldebus-gtfs-2736.json
index 3c1407a1e..017ae953f 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-lurraldebus-gtfs-2736.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-lurraldebus-gtfs-2736.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Lurraldebus Guipuzcoana (La Guipuzcoana)",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-mondragon-arrasate-gtfs-2733.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-mondragon-arrasate-gtfs-2733.json
index 453f061f3..aa096d20b 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-mondragon-arrasate-gtfs-2733.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-mondragon-arrasate-gtfs-2733.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Lurraldebus Arrasate",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-oiartzun-xorrola-gtfs-2725.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-oiartzun-xorrola-gtfs-2725.json
index 113726233..f29d055d6 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-oiartzun-xorrola-gtfs-2725.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-oiartzun-xorrola-gtfs-2725.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Lurraldebus Oiartzun (Xorrola)",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-onati-onatiko-herribusa-gtfs-2737.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-onati-onatiko-herribusa-gtfs-2737.json
index a5812b4ff..fd695a207 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-onati-onatiko-herribusa-gtfs-2737.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-onati-onatiko-herribusa-gtfs-2737.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Oñati urban (Oñatiko herribusa)",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-guipuzcoa-tolosaldea-lurraldebus-gtfs-2726.json b/catalogs/sources/gtfs/schedule/es-guipuzcoa-tolosaldea-lurraldebus-gtfs-2726.json
index 875d11d89..9651a0846 100644
--- a/catalogs/sources/gtfs/schedule/es-guipuzcoa-tolosaldea-lurraldebus-gtfs-2726.json
+++ b/catalogs/sources/gtfs/schedule/es-guipuzcoa-tolosaldea-lurraldebus-gtfs-2726.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Lurraldebus Tolosaldea",
     "is_official": "True",
+    "feed_contact_email": "sanchez@gmail.com",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-navarra-gobierno-de-navarra-nafarroako-gobernua-gtfs-2150.json b/catalogs/sources/gtfs/schedule/es-navarra-gobierno-de-navarra-nafarroako-gobernua-gtfs-2150.json
index 64052fcbf..1a7035dd0 100644
--- a/catalogs/sources/gtfs/schedule/es-navarra-gobierno-de-navarra-nafarroako-gobernua-gtfs-2150.json
+++ b/catalogs/sources/gtfs/schedule/es-navarra-gobierno-de-navarra-nafarroako-gobernua-gtfs-2150.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Gobierno de Navarra (Navarra intercity bus)",
     "is_official": "True",
+    "feed_contact_email": "transportes@navarra.es",
     "location": {
         "country_code": "ES",
         "subdivision_name": "Navarra",
diff --git a/catalogs/sources/gtfs/schedule/es-pm-consorcio-de-transportes-de-mallorca-gtfs-2141.json b/catalogs/sources/gtfs/schedule/es-pm-consorcio-de-transportes-de-mallorca-gtfs-2141.json
index 083a17fcd..44de09f14 100644
--- a/catalogs/sources/gtfs/schedule/es-pm-consorcio-de-transportes-de-mallorca-gtfs-2141.json
+++ b/catalogs/sources/gtfs/schedule/es-pm-consorcio-de-transportes-de-mallorca-gtfs-2141.json
@@ -4,7 +4,7 @@
     "provider": "Consorcio de Transportes de Mallorca",
     "name": "TIB Mallorca",
     "is_official": "True",
-    "status": "active",
+    "feed_contact_email": "info@consorcidetransports.com",
     "location": {
         "country_code": "ES",
         "subdivision_name": "PM",
@@ -23,4 +23,4 @@
         "license": "https://www.tib.org/en/sobre-ctm/portal-de-transparencia/dades-obertes"
     },
     "redirect": []
-}
\ No newline at end of file
+}
diff --git a/catalogs/sources/gtfs/schedule/es-renfe-alta-velocidad-larga-distancia-media-distancia-gtfs-2620.json b/catalogs/sources/gtfs/schedule/es-renfe-alta-velocidad-larga-distancia-media-distancia-gtfs-2620.json
index abc3b668d..672c07b4c 100644
--- a/catalogs/sources/gtfs/schedule/es-renfe-alta-velocidad-larga-distancia-media-distancia-gtfs-2620.json
+++ b/catalogs/sources/gtfs/schedule/es-renfe-alta-velocidad-larga-distancia-media-distancia-gtfs-2620.json
@@ -2,7 +2,7 @@
     "mdb_source_id": 2620,
     "data_type": "gtfs",
     "provider": "Renfe",
-    "name": "Alta-Velocidad-Larga Distancia-Media Distancia",
+    "name": "High-Speed Long-Distance Medium Distance",
     "is_official": "True",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-santa-cruz-de-tenerife-metropolitano-de-tenerife-gtfs-788.json b/catalogs/sources/gtfs/schedule/es-santa-cruz-de-tenerife-metropolitano-de-tenerife-gtfs-788.json
index 0393d5436..930a9e108 100644
--- a/catalogs/sources/gtfs/schedule/es-santa-cruz-de-tenerife-metropolitano-de-tenerife-gtfs-788.json
+++ b/catalogs/sources/gtfs/schedule/es-santa-cruz-de-tenerife-metropolitano-de-tenerife-gtfs-788.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 788,
     "data_type": "gtfs",
-    "provider": "Metropolitano de Tenerife",
+    "provider": "Metropolitano de Tenerife (Metrotenerife)",
     "is_official": "True",
     "location": {
         "country_code": "ES",
@@ -18,4 +18,4 @@
         "direct_download": "http://metrotenerife.com/transit/google_transit.zip",
         "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/es-santa-cruz-de-tenerife-metropolitano-de-tenerife-gtfs-788.zip?alt=media"
     }
-}
\ No newline at end of file
+}
diff --git a/catalogs/sources/gtfs/schedule/es-sevilla-autobuses-urbanos-dos-hermanas-gtfs-2711.json b/catalogs/sources/gtfs/schedule/es-sevilla-autobuses-urbanos-dos-hermanas-gtfs-2711.json
index e0d619aeb..5bc091c56 100644
--- a/catalogs/sources/gtfs/schedule/es-sevilla-autobuses-urbanos-dos-hermanas-gtfs-2711.json
+++ b/catalogs/sources/gtfs/schedule/es-sevilla-autobuses-urbanos-dos-hermanas-gtfs-2711.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2711,
     "data_type": "gtfs",
-    "provider": "Autobuses Urbanos Dos Hermanas",
+    "provider": "Urban Buses Dos Hermanas",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "is_official": "True",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-tmesa-gtfs-2716.json b/catalogs/sources/gtfs/schedule/es-tmesa-gtfs-2716.json
index 0112fb772..fc45520dc 100644
--- a/catalogs/sources/gtfs/schedule/es-tmesa-gtfs-2716.json
+++ b/catalogs/sources/gtfs/schedule/es-tmesa-gtfs-2716.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2716,
     "data_type": "gtfs",
-    "provider": "Transports Municipals D’Egara (TMESA)",
+    "provider": "Transports Municipals D’Egara (TMESA) Terrassa city bus",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-unknown-renfe-cercanias-gtfs-2653.json b/catalogs/sources/gtfs/schedule/es-unknown-renfe-cercanias-gtfs-2653.json
index ba22fd9f1..f62d0be38 100644
--- a/catalogs/sources/gtfs/schedule/es-unknown-renfe-cercanias-gtfs-2653.json
+++ b/catalogs/sources/gtfs/schedule/es-unknown-renfe-cercanias-gtfs-2653.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2653,
     "data_type": "gtfs",
-    "provider": "Renfe Cercanias",
+    "provider": "Renfe commuter trains (Cercanias)",
     "is_offical": "True",
     "name": "Commuter train schedules for Cercanías and Rodalies trains",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/es-valencia-emt-valencia-gtfs-795.json b/catalogs/sources/gtfs/schedule/es-valencia-emt-valencia-gtfs-795.json
index 875fc80b3..4243da59b 100644
--- a/catalogs/sources/gtfs/schedule/es-valencia-emt-valencia-gtfs-795.json
+++ b/catalogs/sources/gtfs/schedule/es-valencia-emt-valencia-gtfs-795.json
@@ -3,6 +3,7 @@
     "data_type": "gtfs",
     "provider": "Empresa Municipal de Transportes de Valencia (EMT Valencia)",
     "is_official": "True",
+    "feed_contact_email": "atencioalaciutadania@emtvalencia.es",
     "location": {
         "country_code": "ES",
         "subdivision_name": "València",
diff --git a/catalogs/sources/gtfs/schedule/es-valenciana-generalitat-valenciana-gtfs-1870.json b/catalogs/sources/gtfs/schedule/es-valenciana-generalitat-valenciana-gtfs-1870.json
index 51bb2fe20..1a9843802 100644
--- a/catalogs/sources/gtfs/schedule/es-valenciana-generalitat-valenciana-gtfs-1870.json
+++ b/catalogs/sources/gtfs/schedule/es-valenciana-generalitat-valenciana-gtfs-1870.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 1870,
     "data_type": "gtfs",
-    "provider": "Generalitat Valenciana",
+    "provider": "Generalitat Valenciana (Intercity bus)",
     "is_official": "True",
     "location": {
         "country_code": "ES",
diff --git a/catalogs/sources/gtfs/schedule/es-valladolid-auvasa-gtfs-2730.json b/catalogs/sources/gtfs/schedule/es-valladolid-auvasa-gtfs-2730.json
index a759f9746..5f8295d37 100644
--- a/catalogs/sources/gtfs/schedule/es-valladolid-auvasa-gtfs-2730.json
+++ b/catalogs/sources/gtfs/schedule/es-valladolid-auvasa-gtfs-2730.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 2730,
     "data_type": "gtfs",
-    "provider": "AUVASA (Autobús urbano de Valladolid) ",
+    "provider": "AUVASA (Valladolid city bus) ",
     "is_official": "True",
     "name": "Raw data from the Spanish National Access Point, powered by MIMTRANS (https://www.transportes.gob.es)",
     "location": {
diff --git a/catalogs/sources/gtfs/schedule/us-vermont-mvrtd-flex-gtfs-2831.json b/catalogs/sources/gtfs/schedule/us-vermont-mvrtd-flex-gtfs-2831.json
new file mode 100644
index 000000000..d67bb720e
--- /dev/null
+++ b/catalogs/sources/gtfs/schedule/us-vermont-mvrtd-flex-gtfs-2831.json
@@ -0,0 +1,25 @@
+{
+    "mdb_source_id": 2831,
+    "data_type": "gtfs",
+    "provider": "Marble Valley Regional Transit District (MVRTD)",
+    "feed_contact_email": "support+test+thebus-vt-us@trilliumtransit.com",
+    "is_official": "True",
+    "name": "Flex",
+    "location": {
+        "country_code": "US",
+        "subdivision_name": "Vermont",
+        "municipality": "Rutland",
+        "bounding_box": {
+            "minimum_latitude": null,
+            "maximum_latitude": null,
+            "minimum_longitude": null,
+            "maximum_longitude": null,
+            "extracted_on": "2025-08-12T20:31:45+00:00"
+        }
+    },
+    "urls": {
+        "direct_download": "https://data.trilliumtransit.com/gtfs/thebus-vt-us/thebus-vt-us--flex-v2.zip",
+        "authentication_type": 0,
+        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/us-vermont-mvrtd-flex-gtfs-2831.zip?alt=media"
+    }
+}