diff --git a/Cargo.toml b/Cargo.toml
index f2cfecc08..fd73acbfa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Hove <core@hove.com>", "Guillaume Pinot <texitoi@texitoi.eu>"]
 name = "transit_model"
-version = "0.67.0"
+version = "0.68.0"
 license = "AGPL-3.0-only"
 description = "Transit data management"
 repository = "https://github.com/hove-io/transit_model"
@@ -39,7 +39,7 @@ parser = []
 [dependencies]
 anyhow = "1"
 chrono = { version = "0.4", default-features = false, features = ["std", "clock"] }
-chrono-tz = { version = "0.9", features = ["serde"] }
+chrono-tz = { version = "0.10", features = ["serde"] }
 csv = "1"
 derivative = "2"
 geo = "0.28"
diff --git a/gtfs2netexfr/src/main.rs b/gtfs2netexfr/src/main.rs
index 903a1950f..2ecb34953 100644
--- a/gtfs2netexfr/src/main.rs
+++ b/gtfs2netexfr/src/main.rs
@@ -23,7 +23,7 @@ use tracing_subscriber::{
     layer::SubscriberExt as _,
     util::SubscriberInitExt as _,
 };
-use transit_model::{configuration, Result};
+use transit_model::{configuration, objects::VehicleJourneyScheduleType, Model, Result};
 
 lazy_static::lazy_static! {
     pub static ref GIT_VERSION: String = transit_model::binary_full_version(env!("CARGO_PKG_VERSION"));
@@ -115,7 +115,11 @@ fn run(opt: Opt) -> Result<()> {
         ..Default::default()
     };
 
-    let model = transit_model::gtfs::Reader::new(configuration).parse(opt.input)?;
+    let mut collections =
+        transit_model::gtfs::Reader::new(configuration).parse_collections(opt.input)?;
+    collections
+        .filter_by_vj_schedule_types(vec![VehicleJourneyScheduleType::ArrivalDepartureTimesOnly])?;
+    let model = Model::new(collections)?;
 
     let mut config = transit_model::netex_france::WriteConfiguration::new(opt.participant)
         .current_datetime(opt.current_datetime);
diff --git a/ntfs2gtfs/tests/fixtures/output/stop_times.txt b/ntfs2gtfs/tests/fixtures/output/stop_times.txt
index e765f481b..a5d2cc8c6 100644
--- a/ntfs2gtfs/tests/fixtures/output/stop_times.txt
+++ b/ntfs2gtfs/tests/fixtures/output/stop_times.txt
@@ -1,3 +1,3 @@
-trip_id,arrival_time,departure_time,stop_id,stop_sequence,pickup_type,drop_off_type,local_zone_id,stop_headsign,timepoint
-trip:1,09:00:00,09:00:00,stop:point:1,0,0,1,,,1
-trip:1,09:10:00,09:10:00,stop:point:2,2,1,0,,,1
+trip_id,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,stop_id,stop_sequence,pickup_type,drop_off_type,local_zone_id,stop_headsign,timepoint,pickup_booking_rule_id,drop_off_booking_rule_id
+trip:1,09:00:00,09:00:00,,,stop:point:1,0,0,1,,,1,,
+trip:1,09:10:00,09:10:00,,,stop:point:2,2,1,0,,,1,,
diff --git a/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/agency.txt b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/agency.txt
new file mode 100644
index 000000000..0ee9a752e
--- /dev/null
+++ b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/agency.txt
@@ -0,0 +1,5 @@
+agency_id,agency_name,agency_url,agency_timezone,agency_lang,agency_phone,agency_email,agency_fare_url
+MFDI:1061,Vélizy Vallées,http://www.navitia.io/,Europe/Paris,,,,
+MFDI:1071,Roissy Ouest,http://www.navitia.io/,Europe/Paris,,,,
+MFDI:1062,Saint Germain Boucles de Seine,http://www.navitia.io/,Europe/Paris,,,,
+MFDI:Operator_100,RATP,http://www.navitia.io/,Europe/Paris,,,,
diff --git a/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/booking_rules.txt b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/booking_rules.txt
new file mode 100644
index 000000000..df4c08aa5
--- /dev/null
+++ b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/booking_rules.txt
@@ -0,0 +1,4 @@
+id,booking_type,message,phone_number,info_url,booking_url
+MFDI:10,0,"Bus de soirée : Le service fonctionne sans réservation, il suffit d'indiquer l'arrêt de descente au conducteur",,,
+MFDI:11,0,24h/24 et 7j/7,01 74 37 24 77,https://www.fileo.com/se-deplacer/reserver-votre-fileo/,https://www.fileo.com/tad
+MFDI:12,0,,,,
diff --git a/tests/fixtures/ntfs_with_windows/input/calendar.txt b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/calendar.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/calendar.txt
rename to ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/calendar.txt
diff --git a/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/routes.txt b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/routes.txt
new file mode 100644
index 000000000..798263c64
--- /dev/null
+++ b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/routes.txt
@@ -0,0 +1,5 @@
+route_id,agency_id,route_short_name,route_long_name,route_desc,route_type,route_url,route_color,route_text_color,route_sort_order
+MFDI:C01376,MFDI:Operator_100,6,6,,1,,6ECA97,000000,
+MFDI:C02060,MFDI:1071,Filéo RS,Filéo Roissy Sud - Villeparisis et Mitry (sur réservation),,3,,4890CD,FFFFFF,
+MFDI:C02491,MFDI:1062,Soir,Soir Saint-Germain-en-Laye,,3,,652C8F,FFFFFF,
+MFDI:C02513,MFDI:1061,Soir,Soir Versailles-Chantiers,,3,,640082,FFFFFF,
diff --git a/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/stop_extensions.txt b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/stop_extensions.txt
new file mode 100644
index 000000000..59dc9fc01
--- /dev/null
+++ b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/stop_extensions.txt
@@ -0,0 +1,40 @@
+object_id,object_system,object_code
+MFDI:22167,source,FR::Quay:22167:FR1
+MFDI:22173,source,FR::Quay:22173:FR1
+MFDI:22073,source,FR::Quay:22073:FR1
+MFDI:41403,source,FR::Quay:41403:FR1
+MFDI:463194,source,FR::Quay:463194:FR1
+MFDI:463042,source,FR::Quay:463042:FR1
+MFDI:426813,source,FR::Quay:426813:FR1
+MFDI:426214,source,FR::Quay:426214:FR1
+MFDI:477725,source,FR::Quay:477725:FR1
+MFDI:34582,source,FR::Quay:34582:FR1
+MFDI:38175,source,FR::Quay:38175:FR1
+MFDI:461909,source,FR::Quay:461909:FR1
+MFDI:18995,source,FR::Quay:18995:FR1
+MFDI:34605,source,FR::Quay:34605:FR1
+MFDI:34744,source,FR::Quay:34744:FR1
+MFDI:11584,source,FR::Quay:11584:FR1
+MFDI:14081,source,FR::Quay:14081:FR1
+MFDI:20324,source,FR::Quay:20324:FR1
+MFDI:20312,source,FR::Quay:20312:FR1
+MFDI:485179,source,FR::Quay:485179:FR1
+MFDI:461827,source,FR::multimodalStopPlace:461827:FR1
+MFDI:426072,source,FR::multimodalStopPlace:426072:FR1
+MFDI:71639,source,FR::multimodalStopPlace:71639:FR1
+MFDI:71673,source,FR::multimodalStopPlace:71673:FR1
+MFDI:64589,source,FR::multimodalStopPlace:64589:FR1
+MFDI:63880,source,FR::multimodalStopPlace:63880:FR1
+MFDI:71026,source,FR::multimodalStopPlace:71026:FR1
+MFDI:64509,source,FR::multimodalStopPlace:64509:FR1
+MFDI:64485,source,FR::multimodalStopPlace:64485:FR1
+MFDI:63534,source,FR::multimodalStopPlace:63534:FR1
+MFDI:63529,source,FR::multimodalStopPlace:63529:FR1
+MFDI:63438,source,FR::multimodalStopPlace:63438:FR1
+MFDI:73556,source,FR::multimodalStopPlace:73556:FR1
+MFDI:73596,source,FR::multimodalStopPlace:73596:FR1
+MFDI:73591,source,FR::multimodalStopPlace:73591:FR1
+MFDI:71347,source,FR::multimodalStopPlace:71347:FR1
+MFDI:73486,source,FR::multimodalStopPlace:73486:FR1
+MFDI:71199,source,FR::multimodalStopPlace:71199:FR1
+MFDI:480959,source,FR::multimodalStopPlace:480959:FR1
diff --git a/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/stop_times.txt b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/stop_times.txt
new file mode 100644
index 000000000..5969787b0
--- /dev/null
+++ b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/stop_times.txt
@@ -0,0 +1,21 @@
+trip_id,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,stop_id,stop_sequence,pickup_type,drop_off_type,local_zone_id,stop_headsign,timepoint,pickup_booking_rule_id,drop_off_booking_rule_id
+MFDI:KVVB:158023-C02513-1638-260,22:30:00,22:31:00,,,MFDI:485179,0,0,1,,,1,,
+MFDI:KVVB:158023-C02513-1638-260,22:33:00,22:34:00,,,MFDI:426214,1,0,0,,,1,,
+MFDI:KVVB:158023-C02513-1638-260,,,22:36:00,22:55:00,MFDI:20312,12,1,2,,,0,MFDI:10,MFDI:10
+MFDI:KVVB:158023-C02513-1638-260,,,22:36:00,22:55:00,MFDI:20324,24,1,2,,,0,MFDI:10,MFDI:10
+MFDI:KVVB:158023-C02513-1638-260,,,22:36:00,22:55:00,MFDI:11584,32,1,2,,,0,MFDI:10,MFDI:10
+MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,,,23:15:00,23:48:00,MFDI:34605,0,2,1,,,0,MFDI:12,MFDI:12
+MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,,,23:15:00,23:48:00,MFDI:34744,1,2,2,,,0,MFDI:12,MFDI:12
+MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,,,23:15:00,23:48:00,MFDI:14081,15,2,2,,,0,MFDI:12,MFDI:12
+MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,,,23:15:00,23:48:00,MFDI:34582,25,2,2,,,0,MFDI:12,MFDI:12
+MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,,,23:15:00,23:48:00,MFDI:461909,35,1,2,,,0,MFDI:12,MFDI:12
+MFDI:KRO6:153358-C02060-680-260,26:39:00,26:39:00,,,MFDI:477725,0,2,1,,,1,MFDI:11,MFDI:11
+MFDI:KRO6:153358-C02060-680-260,26:40:00,26:40:00,,,MFDI:38175,1,2,2,,,1,MFDI:11,MFDI:11
+MFDI:KRO6:153358-C02060-680-260,26:52:00,26:52:00,,,MFDI:18995,17,2,2,,,1,MFDI:11,MFDI:11
+MFDI:KRO6:153358-C02060-680-260,27:06:00,27:06:00,,,MFDI:41403,32,2,2,,,1,MFDI:11,MFDI:11
+MFDI:KRO6:153358-C02060-680-260,27:15:00,27:15:00,,,MFDI:426813,37,1,2,,,1,MFDI:11,MFDI:11
+MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,10:30:00,10:30:00,,,MFDI:22073,0,0,1,,,1,,
+MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,10:31:00,10:31:00,,,MFDI:22167,1,0,0,,,1,,
+MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,10:43:00,10:43:00,,,MFDI:22173,11,0,0,,,1,,
+MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,10:54:00,10:54:00,,,MFDI:463194,20,0,0,,,1,,
+MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,11:03:00,11:03:00,,,MFDI:463042,27,1,0,,,1,,
diff --git a/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/stops.txt b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/stops.txt
new file mode 100644
index 000000000..fb22a7ea9
--- /dev/null
+++ b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/stops.txt
@@ -0,0 +1,40 @@
+stop_id,stop_code,stop_name,stop_desc,stop_lon,stop_lat,zone_id,stop_url,location_type,parent_station,stop_timezone,level_id,wheelchair_boarding,platform_code
+MFDI:22167,,Picpus,,2.401248269453829,48.84501767720269,1,,0,MFDI:71639,Europe/Paris,,2,
+MFDI:22173,,Glacière,,2.3434974927179884,48.831170235245835,1,,0,MFDI:71026,Europe/Paris,,2,
+MFDI:22073,,Nation,,2.3958598043279085,48.84789550545761,1,,0,MFDI:71673,Europe/Paris,,2,
+MFDI:41403,,Cargo Centre,,2.526990016633599,48.99817129747993,5,,0,MFDI:73591,Europe/Paris,,1,
+MFDI:463194,,La Motte-Picquet - Grenelle,,2.298957096977008,48.848765448122315,1,,0,MFDI:71199,Europe/Paris,,2,
+MFDI:463042,,Charles de Gaulle - Etoile,,2.2947520493673434,48.87371127132366,1,,0,MFDI:71347,Europe/Paris,,2,
+MFDI:426813,,Gare de Roissypole - Aéroport CDG1 Terminal 3 (C4),,2.559069276593061,49.010290004685544,,,0,MFDI:73596,Europe/Paris,,2,
+MFDI:426214,,La Logeraie,,2.1359934967138585,48.766289059613705,4,,0,MFDI:63529,Europe/Paris,,1,
+MFDI:477725,,Verdi,,2.577391101137773,48.961194121418,4,,0,MFDI:480959,Europe/Paris,,2,
+MFDI:34582,,Fourqueux,,2.0804267048554177,48.89058561987773,,,0,MFDI:64509,Europe/Paris,,1,
+MFDI:38175,,Parmentier,,2.561581492140883,48.947693512717194,4,,0,MFDI:73486,Europe/Paris,,2,
+MFDI:461909,,Gare de Saint-Germain-en-Laye,,2.094588526727687,48.898931576292874,,,0,MFDI:64589,Europe/Paris,,1,
+MFDI:18995,,Croix l'Aumône,,2.524710804326184,48.96497157469924,4,,0,MFDI:73556,Europe/Paris,,2,
+MFDI:34605,,Gare de Saint-Germain-en-Laye,,2.0939283750483924,48.89924135453759,,,0,MFDI:64589,Europe/Paris,,1,
+MFDI:34744,,République,,2.0927460449808457,48.89812620815719,,,0,MFDI:426072,Europe/Paris,,1,
+MFDI:11584,,Porte Jaune,,2.229129261380777,48.76610796421317,4,,0,MFDI:63534,Europe/Paris,,1,
+MFDI:14081,,Victor Hugo,,2.063504165681303,48.886623198199004,,,0,MFDI:64485,Europe/Paris,,2,
+MFDI:20324,,Clos Normand,,2.186312472329811,48.75818767629223,4,,0,MFDI:63438,Europe/Paris,,1,
+MFDI:20312,,Les Tilleuls,,2.1615499577506054,48.76517599148135,4,,0,MFDI:461827,Europe/Paris,,2,
+MFDI:485179,,Gare routière de Versailles Chantiers - Quai G,,2.1340608589561016,48.795848498088226,4,,0,MFDI:63880,Europe/Paris,,1,
+MFDI:461827,,Les Tilleuls,,2.1613451720416506,48.76521952597488,,,1,,,,0,
+MFDI:426072,,République / Rue de la Salle,,2.092660713832334,48.89762192758876,,,1,,,,0,
+MFDI:71639,,Picpus,,2.402166806721031,48.845125696754025,,,1,,,,0,
+MFDI:71673,,Nation,,2.3963316057344417,48.848927647042316,,,1,,,,0,
+MFDI:64589,,Saint-Germain-en-Laye,,2.0951814549394174,48.899349756253876,,,1,,,,0,
+MFDI:63880,,Versailles Chantiers,,2.134652391388478,48.79588875952142,,,1,,,,0,
+MFDI:71026,,Glacière,,2.3438687884909264,48.8308934672617,,,1,,,,0,
+MFDI:64509,,Fourqueux,,2.080767458510045,48.89098395203159,,,1,,,,0,
+MFDI:64485,,Victor Hugo,,2.063504165681303,48.886623198199004,,,1,,,,0,
+MFDI:63534,,Porte Jaune,,2.2291546111332714,48.766234048830825,,,1,,,,0,
+MFDI:63529,,La Logeraie,,2.1363481054691924,48.76623765829017,,,1,,,,0,
+MFDI:63438,,Clos Normand,,2.1861969917891195,48.758177894949306,,,1,,,,0,
+MFDI:73556,,Croix l'Aumône,,2.524833265434999,48.965021518604,,,1,,,,0,
+MFDI:73596,,Roissy Aéroport CDG 1 (Terminal 3) (Tremblay-en-France),,2.5601295519817535,49.01033329803776,,,1,,,,0,
+MFDI:73591,,Cargo Centre,,2.5261341855607036,48.998356758085166,,,1,,,,0,
+MFDI:71347,,Charles de Gaulle - Etoile,,2.2946168784613463,48.87362503818625,,,1,,,,0,
+MFDI:73486,,Parmentier / Saint Vincent de Paul,,2.5608350156242676,48.94635987507931,,,1,,,,0,
+MFDI:71199,,La Motte-Picquet - Grenelle,,2.2984077121284154,48.84918377697637,,,1,,,,0,
+MFDI:480959,,Verdi,,2.577391101137773,48.961194121418,,,1,,,,0,
diff --git a/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/transfers.txt b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/transfers.txt
new file mode 100644
index 000000000..9753645a3
--- /dev/null
+++ b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/transfers.txt
@@ -0,0 +1,7 @@
+from_stop_id,to_stop_id,transfer_type,min_transfer_time
+MFDI:34744,MFDI:461909,2,206
+MFDI:34744,MFDI:34605,2,192
+MFDI:34605,MFDI:34744,2,192
+MFDI:461909,MFDI:34744,2,206
+MFDI:461909,MFDI:34605,2,62
+MFDI:34605,MFDI:461909,2,62
diff --git a/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/trips.txt b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/trips.txt
new file mode 100644
index 000000000..1bfe9280a
--- /dev/null
+++ b/ntfs2gtfs/tests/fixtures/output_gtfs_pickup_drop_off_windows/trips.txt
@@ -0,0 +1,5 @@
+route_id,service_id,trip_id,trip_headsign,trip_short_name,direction_id,block_id,shape_id,wheelchair_accessible,bikes_allowed
+MFDI:C02513,MFDI:1000,MFDI:KVVB:158023-C02513-1638-260,Porte Jaune,,1,,,0,0
+MFDI:C02491,MFDI:1,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,Gare de St-Germain-en-Laye - Gare Routière,,0,,,0,0
+MFDI:C02060,MFDI:1000,MFDI:KRO6:153358-C02060-680-260,Gare de Roissypole Aéroport CDG 1,,1,,,0,0
+MFDI:C01376,MFDI:1,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,Charles de Gaulle-Etoile,,1,,,2,0
diff --git a/ntfs2gtfs/tests/ntfs2gtfs.rs b/ntfs2gtfs/tests/ntfs2gtfs.rs
index e00b31dcd..97161822f 100644
--- a/ntfs2gtfs/tests/ntfs2gtfs.rs
+++ b/ntfs2gtfs/tests/ntfs2gtfs.rs
@@ -194,3 +194,21 @@ fn test_ntfs2gtfs_with_fare_urls_and_deeplinks() {
         "./tests/fixtures/output_gtfs_with_fare_url_deeplinks",
     );
 }
+
+#[test]
+fn test_ntfs2gtfs_with_pickup_drop_off_windows_stoptimes() {
+    let output_dir = TempDir::new().expect("create temp dir failed");
+    Command::cargo_bin("ntfs2gtfs")
+        .expect("Failed to find binary 'ntfs2gtfs'")
+        .arg("--input")
+        .arg("../tests/fixtures/pickup_drop_off_windows/input_ntfs")
+        .arg("--output")
+        .arg(output_dir.path().to_str().unwrap())
+        .assert()
+        .success();
+    compare_output_dir_with_expected(
+        output_dir,
+        None,
+        "./tests/fixtures/output_gtfs_pickup_drop_off_windows",
+    );
+}
diff --git a/ntfs2netexfr/src/main.rs b/ntfs2netexfr/src/main.rs
index 37e0894f6..1e936a8dd 100644
--- a/ntfs2netexfr/src/main.rs
+++ b/ntfs2netexfr/src/main.rs
@@ -23,7 +23,7 @@ use tracing_subscriber::{
     layer::SubscriberExt as _,
     util::SubscriberInitExt as _,
 };
-use transit_model::{Model, Result};
+use transit_model::{objects::VehicleJourneyScheduleType, Model, Result};
 
 lazy_static::lazy_static! {
     pub static ref GIT_VERSION: String = transit_model::binary_full_version(env!("CARGO_PKG_VERSION"));
@@ -91,6 +91,8 @@ fn run(opt: Opt) -> Result<()> {
 
     let mut collections = transit_model::ntfs::read_collections(opt.input)?;
     collections.remove_route_points();
+    collections
+        .filter_by_vj_schedule_types(vec![VehicleJourneyScheduleType::ArrivalDepartureTimesOnly])?;
     let model = Model::new(collections)?;
 
     let mut config = transit_model::netex_france::WriteConfiguration::new(opt.participant)
diff --git a/ntfs2netexfr/tests/ntfs2netexfr.rs b/ntfs2netexfr/tests/ntfs2netexfr.rs
index 1609f090c..1ca29cb65 100644
--- a/ntfs2netexfr/tests/ntfs2netexfr.rs
+++ b/ntfs2netexfr/tests/ntfs2netexfr.rs
@@ -1,6 +1,7 @@
 use assert_cmd::prelude::*;
 use std::process::Command;
 use tempfile::TempDir;
+use transit_model::test_utils::*;
 
 #[test]
 fn test_ntfs2netexfr() {
@@ -78,3 +79,25 @@ fn test_ntfs2netexfr_create_foobar() {
         .success();
     assert!(netexfr_foobar.join("arrets.xml").is_file());
 }
+
+#[test]
+fn test_ntfs2netexfr_with_pickup_drop_off_windows_stoptimes() {
+    let output_dir = TempDir::new().expect("create temp dir failed");
+    Command::cargo_bin("ntfs2netexfr")
+        .expect("Failed to find binary 'ntfs2netexfr'")
+        .arg("--input")
+        .arg("../tests/fixtures/pickup_drop_off_windows/input_ntfs")
+        .arg("--output")
+        .arg(output_dir.path().to_str().unwrap())
+        .arg("--participant")
+        .arg("Participant")
+        .arg("--current-datetime")
+        .arg("2024-04-03T17:19:00Z")
+        .assert()
+        .success();
+    compare_output_dir_with_expected(
+        output_dir,
+        Some(vec!["lignes.xml"]),
+        "../tests/fixtures/netex_france/output_netexfr_pickup_drop_off_windows",
+    );
+}
diff --git a/src/gtfs/mod.rs b/src/gtfs/mod.rs
index 6b2ad8f50..3f89e92ec 100644
--- a/src/gtfs/mod.rs
+++ b/src/gtfs/mod.rs
@@ -207,6 +207,8 @@ struct StopTime {
     trip_id: String,
     arrival_time: Option<Time>,
     departure_time: Option<Time>,
+    start_pickup_drop_off_window: Option<Time>,
+    end_pickup_drop_off_window: Option<Time>,
     #[serde(deserialize_with = "de_without_slashes")]
     stop_id: String,
     stop_sequence: u32,
@@ -222,6 +224,40 @@ struct StopTime {
         default = "default_true_bool"
     )]
     timepoint: bool,
+    pickup_booking_rule_id: Option<String>,
+    drop_off_booking_rule_id: Option<String>,
+}
+
+#[derive(Derivative, Serialize)]
+#[derivative(Default)]
+enum BookingType {
+    #[derivative(Default)]
+    #[serde(rename = "0")]
+    RealTime,
+}
+
+#[derive(Derivative, Serialize)]
+#[derivative(Default)]
+struct BookingRule {
+    id: String,
+    booking_type: BookingType,
+    message: Option<String>,
+    phone_number: Option<String>,
+    info_url: Option<String>,
+    booking_url: Option<String>,
+}
+
+impl<'a> From<&'a objects::BookingRule> for BookingRule {
+    fn from(obj: &objects::BookingRule) -> BookingRule {
+        BookingRule {
+            id: obj.id.clone(),
+            message: obj.message.clone(),
+            phone_number: obj.phone.clone(),
+            info_url: obj.info_url.clone(),
+            booking_url: obj.booking_url.clone(),
+            ..Default::default()
+        }
+    }
 }
 
 #[derive(Serialize, Deserialize, Debug, Derivative, PartialEq, Clone)]
@@ -705,6 +741,7 @@ pub fn write<P: AsRef<Path>>(model: Model, path: P, extend_route_type: bool) ->
         &model.stop_points,
         &model.stop_time_headsigns,
     )?;
+    write::write_booking_rules(path, &model.booking_rules)?;
     write::write_shapes(path, &model.geometries)?;
     write_collection_with_id(path, "pathways.txt", &model.pathways)?;
     write_collection_with_id(path, "levels.txt", &model.levels)?;
diff --git a/src/gtfs/write.rs b/src/gtfs/write.rs
index cdce63a34..6ca8461e9 100644
--- a/src/gtfs/write.rs
+++ b/src/gtfs/write.rs
@@ -13,7 +13,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>
 
 use super::{
-    Agency, DirectionType, Route, RouteType, Shape, Stop, StopLocationType, StopTime,
+    Agency, BookingRule, DirectionType, Route, RouteType, Shape, Stop, StopLocationType, StopTime,
     TicketingDeepLinks, Transfer, Trip,
 };
 use crate::gtfs::ExtendedRoute;
@@ -475,6 +475,16 @@ pub fn write_stop_times(
         .with_context(|| format!("Error reading {:?}", stop_times_path))?;
     for (vj_idx, vj) in vehicle_journeys {
         for st in &vj.stop_times {
+            // Notes :
+            // 1 - In ntm, a vj can have n booking_rules. In gtfs it's only one. So we take the first one.
+            // 2 - In ntm (for the moment), a booking_rule is on line or trip/vj, not stoptime.
+            // So we apply the same booking_rule on all stoptimes if pickup_type or drop_off_type is =2 (odt).
+            // Not all stoptimes need to have booking_rule, as some may be in regular service (pickup_type/drop_off_type 0).
+            let booking_rule_id_opt = vj
+                .booking_rule_links
+                .first()
+                .filter(|_| st.pickup_type == 2u8 || st.drop_off_type == 2u8)
+                .cloned();
             st_wtr
                 .serialize(StopTime {
                     stop_id: stop_points[st.stop_point_idx].id.clone(),
@@ -482,6 +492,8 @@ pub fn write_stop_times(
                     stop_sequence: st.sequence,
                     arrival_time: st.arrival_time,
                     departure_time: st.departure_time,
+                    start_pickup_drop_off_window: st.start_pickup_drop_off_window,
+                    end_pickup_drop_off_window: st.end_pickup_drop_off_window,
                     pickup_type: st.pickup_type,
                     drop_off_type: st.drop_off_type,
                     local_zone_id: st.local_zone_id,
@@ -489,6 +501,8 @@ pub fn write_stop_times(
                         .get(&(vehicle_journeys[vj_idx].id.clone(), st.sequence))
                         .cloned(),
                     timepoint: matches!(st.precision, None | Some(StopTimePrecision::Exact)),
+                    pickup_booking_rule_id: booking_rule_id_opt.clone(),
+                    drop_off_booking_rule_id: booking_rule_id_opt,
                 })
                 .with_context(|| format!("Error reading {:?}", st_wtr))?;
         }
@@ -499,6 +513,27 @@ pub fn write_stop_times(
     Ok(())
 }
 
+pub fn write_booking_rules(
+    path: &path::Path,
+    booking_rules: &CollectionWithId<objects::BookingRule>,
+) -> Result<()> {
+    if booking_rules.is_empty() {
+        return Ok(());
+    }
+    let filename = "booking_rules.txt";
+    info!("Writing {}", filename);
+    let path = path.join(filename);
+    let mut wtr =
+        csv::Writer::from_path(&path).with_context(|| format!("Error opening {:?}", path))?;
+    for br in booking_rules.values() {
+        wtr.serialize(BookingRule::from(br))
+            .with_context(|| format!("Error writing {:?}", path))?;
+    }
+    wtr.flush()
+        .with_context(|| format!("Error writing {:?}", path))?;
+    Ok(())
+}
+
 fn ntfs_geometry_to_gtfs_shapes(g: &objects::Geometry) -> impl Iterator<Item = Shape> + '_ {
     let points = match g.geometry {
         GeoGeometry::LineString(ref linestring) => &linestring.0[..],
@@ -1293,9 +1328,9 @@ mod tests {
         let mut output_contents = String::new();
         output_file.read_to_string(&mut output_contents).unwrap();
         assert_eq!(
-            "trip_id,arrival_time,departure_time,stop_id,stop_sequence,pickup_type,drop_off_type,local_zone_id,stop_headsign,timepoint\n\
-            vj:01,06:00:00,06:00:00,sp:01,1,0,0,,somewhere,1\n\
-            vj:01,06:06:27,06:06:27,sp:01,2,2,1,3,,0\n",
+            "trip_id,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,stop_id,stop_sequence,pickup_type,drop_off_type,local_zone_id,stop_headsign,timepoint,pickup_booking_rule_id,drop_off_booking_rule_id\n\
+            vj:01,06:00:00,06:00:00,,,sp:01,1,0,0,,somewhere,1,,\n\
+            vj:01,06:06:27,06:06:27,,,sp:01,2,2,1,3,,0,,\n",
             output_contents
         );
         tmp_dir.close().expect("delete temp dir");
diff --git a/src/model.rs b/src/model.rs
index 05dea22c2..3d5577e0b 100644
--- a/src/model.rs
+++ b/src/model.rs
@@ -169,6 +169,17 @@ impl Collections {
         Ok(())
     }
 
+    /// Filters vehicle_journeys in collection based on their schedule types
+    /// Multiple choice possible (through Vec<>). See VehicleJourneyScheduleType list.
+    pub fn filter_by_vj_schedule_types(
+        &mut self,
+        types: Vec<VehicleJourneyScheduleType>,
+    ) -> Result<()> {
+        self.vehicle_journeys
+            .retain(|vj| types.contains(&vj.get_schedule_type()));
+        Ok(())
+    }
+
     /// Keep the collections consistent for the new model by purging unreferenced data by
     /// calendars
     pub fn sanitize(&mut self) -> Result<()> {
diff --git a/src/model_builder.rs b/src/model_builder.rs
index fdbcb09cd..6606b4f01 100644
--- a/src/model_builder.rs
+++ b/src/model_builder.rs
@@ -33,8 +33,8 @@
 use crate::model::{Collections, Model};
 use crate::objects::{
     Calendar, CommercialMode, Date, Equipment, Geometry, Line, Network, Occupancy, OccupancyStatus,
-    PhysicalMode, Route, StopArea, StopPoint, StopTime, Time, Transfer, TripProperty,
-    ValidityPeriod, VehicleJourney,
+    PhysicalMode, Route, StopArea, StopPoint, StopTime, StopTimePrecision, Time, Transfer,
+    TripProperty, ValidityPeriod, VehicleJourney,
 };
 use chrono::NaiveDateTime;
 use chrono_tz;
@@ -754,6 +754,110 @@ impl<'a> VehicleJourneyBuilder<'a> {
         self
     }
 
+    /// add a window stoptime to the vehicle journey
+    /// with (by default) pickup_type/drop_off_type and stop_time_precision at value 2
+    ///
+    /// ```
+    /// # use transit_model::ModelBuilder;
+    ///
+    /// # fn main() {
+    /// let model = ModelBuilder::default()
+    ///        .vj("vj1", |vj_builder| {
+    ///            vj_builder
+    ///                .stw("A", "08:00:00", "19:00:00")
+    ///                .stw("B", "08:00:00", "19:00:00");
+    ///        })
+    ///        .build();
+    /// # }
+    /// ```
+    pub fn stw(
+        self,
+        stop_point_id: &str,
+        start_pickup_drop_off_window: impl IntoTime,
+        end_pickup_drop_off_window: impl IntoTime,
+    ) -> Self {
+        self.stw_mut(
+            stop_point_id,
+            start_pickup_drop_off_window.as_time(),
+            end_pickup_drop_off_window.as_time(),
+            2u8,
+            2u8,
+            Some(StopTimePrecision::Estimated),
+            None,
+            |_st| {},
+        )
+    }
+
+    ///  add a more detailed window stoptime to the vehicle journey
+    #[allow(clippy::too_many_arguments)]
+    pub fn stw_detailed(
+        self,
+        stop_point_id: &str,
+        start_pickup_drop_off_window: impl IntoTime,
+        end_pickup_drop_off_window: impl IntoTime,
+        pickup_type: u8,
+        drop_off_type: u8,
+        precision: Option<StopTimePrecision>,
+        local_zone_id: Option<u16>,
+    ) -> Self {
+        self.stw_mut(
+            stop_point_id,
+            start_pickup_drop_off_window.as_time(),
+            end_pickup_drop_off_window.as_time(),
+            pickup_type,
+            drop_off_type,
+            precision,
+            local_zone_id,
+            |_st| {},
+        )
+    }
+
+    /// add a window stopTime to the vehicle journey and modify it
+    #[allow(clippy::too_many_arguments)]
+    fn stw_mut<F>(
+        mut self,
+        stop_point_id: &str,
+        start_pickup_drop_off_window: impl IntoTime,
+        end_pickup_drop_off_window: impl IntoTime,
+        pickup_type: u8,
+        drop_off_type: u8,
+        precision: Option<StopTimePrecision>,
+        local_zone_id: Option<u16>,
+        st_muter: F,
+    ) -> Self
+    where
+        F: FnOnce(&mut StopTime),
+    {
+        {
+            let stop_point_idx = self.find_or_create_sp(stop_point_id);
+            let vj = &mut self
+                .model
+                .collections
+                .vehicle_journeys
+                .index_mut(self.vj_idx);
+            let sequence = vj.stop_times.len() as u32;
+            let mut stop_time = StopTime {
+                stop_point_idx,
+                sequence,
+                arrival_time: None,
+                departure_time: None,
+                start_pickup_drop_off_window: Some(start_pickup_drop_off_window.as_time()),
+                end_pickup_drop_off_window: Some(end_pickup_drop_off_window.as_time()),
+                boarding_duration: 0u16,
+                alighting_duration: 0u16,
+                pickup_type,
+                drop_off_type,
+                local_zone_id,
+                precision,
+            };
+            st_muter(&mut stop_time);
+
+            vj.stop_times.push(stop_time);
+        }
+
+        self
+    }
+
     /// Set the route id of the vj
     ///
     /// ```
@@ -1009,6 +1113,7 @@ impl<'a> Drop for VehicleJourneyBuilder<'a> {
 #[cfg(test)]
 mod test {
     use super::ModelBuilder;
+    use super::{StopTimePrecision, Time};
 
     #[test]
     fn simple_model_creation() {
@@ -1135,4 +1240,90 @@ mod test {
                 .collect()
         );
     }
+
+    #[test]
+    fn test_vj_with_window_stoptimes() {
+        let model = ModelBuilder::default()
+            .vj("vj1", |vj| {
+                vj.stw("sp1", "10:00:00", "20:00:00")
+                    .stw("sp2", "10:10:00", "20:10:00");
+            })
+            .build();
+
+        let vj = model.vehicle_journeys.get("vj1").unwrap();
+        let mut st_iter = vj.stop_times.iter();
+
+        let st1 = st_iter.next().unwrap();
+        assert_eq!(st1.start_pickup_drop_off_window, Some(Time::new(10, 0, 0)));
+        assert_eq!(st1.end_pickup_drop_off_window, Some(Time::new(20, 0, 0)));
+        assert!(st1.departure_time.is_none());
+        assert!(st1.arrival_time.is_none());
+        assert_eq!(st1.pickup_type, 2u8);
+        assert_eq!(st1.drop_off_type, 1u8); // see enhancers::enhance_pickup_dropoff
+        assert_eq!(st1.precision, Some(StopTimePrecision::Estimated));
+
+        let st2 = st_iter.next().unwrap();
+        assert_eq!(st2.start_pickup_drop_off_window, Some(Time::new(10, 10, 0)));
+        assert_eq!(st2.end_pickup_drop_off_window, Some(Time::new(20, 10, 0)));
+        assert!(st2.departure_time.is_none());
+        assert!(st2.arrival_time.is_none());
+        assert_eq!(st2.pickup_type, 1u8); // see enhancers::enhance_pickup_dropoff
+        assert_eq!(st2.drop_off_type, 2u8);
+        assert_eq!(st2.precision, Some(StopTimePrecision::Estimated));
+
+        assert_eq!(
+            model.get_corresponding_from_idx(model.vehicle_journeys.get_idx("vj1").unwrap()),
+            ["sp1", "sp2"]
+                .iter()
+                .map(|s| model.stop_points.get_idx(s).unwrap())
+                .collect()
+        );
+    }
+
+    #[test]
+    fn test_vj_with_window_detailed_stoptimes() {
+        let model = ModelBuilder::default()
+            .vj("vj1", |vj| {
+                vj.stw_detailed(
+                    "sp1",
+                    "10:00:00",
+                    "20:00:00",
+                    1u8,
+                    1u8,
+                    Some(StopTimePrecision::Exact),
+                    Some(7u16),
+                )
+                .stw_detailed(
+                    "sp2",
+                    "10:10:00",
+                    "20:10:00",
+                    1u8,
+                    1u8,
+                    Some(StopTimePrecision::Exact),
+                    Some(7u16),
+                );
+            })
+            .build();
+
+        let vj = model.vehicle_journeys.get("vj1").unwrap();
+        let mut st_iter = vj.stop_times.iter();
+
+        let st1 = st_iter.next().unwrap();
+        assert_eq!(st1.start_pickup_drop_off_window, Some(Time::new(10, 0, 0)));
+        assert_eq!(st1.end_pickup_drop_off_window, Some(Time::new(20, 0, 0)));
+        assert!(st1.departure_time.is_none());
+        assert!(st1.arrival_time.is_none());
+        assert_eq!(st1.pickup_type, 1u8);
+        assert_eq!(st1.drop_off_type, 1u8);
+        assert_eq!(st1.precision, Some(StopTimePrecision::Exact));
+
+        let st2 = st_iter.next().unwrap();
+        assert_eq!(st2.start_pickup_drop_off_window, Some(Time::new(10, 10, 0)));
+        assert_eq!(st2.end_pickup_drop_off_window, Some(Time::new(20, 10, 0)));
+        assert!(st2.departure_time.is_none());
+        assert!(st2.arrival_time.is_none());
+        assert_eq!(st2.pickup_type, 1u8);
+        assert_eq!(st2.drop_off_type, 1u8);
+        assert_eq!(st2.precision, Some(StopTimePrecision::Exact));
+    }
 }
diff --git a/src/objects.rs b/src/objects.rs
index 4fbcaf5da..268729038 100644
--- a/src/objects.rs
+++ b/src/objects.rs
@@ -696,6 +696,27 @@ impl VehicleJourney {
             .last()
             .and_then(|st| st.arrival_time.or(st.end_pickup_drop_off_window))
     }
+    pub fn get_schedule_type(&self) -> VehicleJourneyScheduleType {
+        let mut have_arrival_and_departure_times = false;
+        let mut have_start_end_pickup_drop_off_windows = false;
+        for st in &self.stop_times {
+            if st.arrival_time.is_some() && st.departure_time.is_some() {
+                have_arrival_and_departure_times = true;
+            }
+            if st.start_pickup_drop_off_window.is_some() && st.end_pickup_drop_off_window.is_some()
+            {
+                have_start_end_pickup_drop_off_windows = true;
+            }
+        }
+        match (
+            have_arrival_and_departure_times,
+            have_start_end_pickup_drop_off_windows,
+        ) {
+            (true, false) => VehicleJourneyScheduleType::ArrivalDepartureTimesOnly,
+            (false, true) => VehicleJourneyScheduleType::PickupDropOffWindowsOnly,
+            _ => VehicleJourneyScheduleType::Mixed,
+        }
+    }
 }
 
 #[derive(Debug, Error)]
@@ -752,11 +773,28 @@ impl VehicleJourney {
                 }
             };
 
-            if (curr_st.arrival_time > curr_st.departure_time)
-                || (curr_st.start_pickup_drop_off_window > curr_st.end_pickup_drop_off_window)
-                || (curr_st.departure_time.is_some()
+            if curr_st.arrival_time > curr_st.departure_time
+                || curr_st.start_pickup_drop_off_window > curr_st.end_pickup_drop_off_window
+                // See test below: sort_and_check_stop_times::growing_departure_to_arrival_time
+                || curr_st.departure_time.is_some()
+                    && next_st.arrival_time.is_some()
+                    && curr_st.departure_time > next_st.arrival_time
+                // See test below: sort_and_check_stop_times::growing_start_pickup_drop_off_windows
+                || curr_st.start_pickup_drop_off_window.is_some()
+                    && next_st.start_pickup_drop_off_window.is_some()
+                    && curr_st.start_pickup_drop_off_window > next_st.start_pickup_drop_off_window
+                // See test below: sort_and_check_stop_times::growing_end_pickup_drop_off_windows
+                || curr_st.end_pickup_drop_off_window.is_some()
+                    && next_st.end_pickup_drop_off_window.is_some()
+                    && curr_st.end_pickup_drop_off_window > next_st.end_pickup_drop_off_window
+                // See test below: sort_and_check_stop_times::growing_departure_to_start_pickup_drop_off_windows
+                || curr_st.departure_time.is_some()
+                    && next_st.start_pickup_drop_off_window.is_some()
+                    && curr_st.departure_time > next_st.start_pickup_drop_off_window
+                // See test below: sort_and_check_stop_times::growing_end_pickup_drop_off_windows_to_arrival
+                || curr_st.end_pickup_drop_off_window.is_some()
                     && next_st.arrival_time.is_some()
-                    && curr_st.departure_time > next_st.arrival_time)
+                    && curr_st.end_pickup_drop_off_window > next_st.arrival_time
             {
                 return Err(StopTimeError::IncoherentStopTimes {
                     first_incorrect_sequence: curr_st.sequence,
@@ -769,6 +807,13 @@ impl VehicleJourney {
     }
 }
 
+#[derive(Eq, PartialEq)]
+pub enum VehicleJourneyScheduleType {
+    ArrivalDepartureTimesOnly,
+    PickupDropOffWindowsOnly,
+    Mixed, // for vehicle having both arrival/departure times and start/end pickup_drop_off_windows in its stoptimes
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Frequency {
     #[serde(rename = "trip_id")]
@@ -2248,7 +2293,13 @@ mod tests {
     mod sort_and_check_stop_times {
         use super::*;
 
-        fn generate_stop_times(configs: Vec<(u32, &str, &str)>) -> Vec<StopTime> {
+        #[allow(clippy::type_complexity)]
+        fn generate_stop_times(
+            configs: Vec<(u32, Option<&str>, Option<&str>, Option<&str>, Option<&str>)>,
+        ) -> Vec<StopTime> {
+            fn as_time_opt(p: Option<&str>) -> Option<Time> {
+                p.and_then(|t| t.parse::<Time>().ok())
+            }
             let stop_points = typed_index_collection::CollectionWithId::from(StopPoint {
                 id: "sp1".to_string(),
                 ..Default::default()
@@ -2256,13 +2307,13 @@ mod tests {
             let stop_point_idx = stop_points.get_idx("sp1").unwrap();
             configs
                 .into_iter()
-                .map(|(sequence, arrival, departure)| StopTime {
+                .map(|(sequence, arrival, departure, start, end)| StopTime {
                     stop_point_idx,
                     sequence,
-                    arrival_time: Some(Time::from_str(arrival).unwrap()),
-                    departure_time: Some(Time::from_str(departure).unwrap()),
-                    start_pickup_drop_off_window: None,
-                    end_pickup_drop_off_window: None,
+                    arrival_time: as_time_opt(arrival),
+                    departure_time: as_time_opt(departure),
+                    start_pickup_drop_off_window: as_time_opt(start),
+                    end_pickup_drop_off_window: as_time_opt(end),
                     boarding_duration: 0,
                     alighting_duration: 0,
                     pickup_type: 0,
@@ -2274,56 +2325,111 @@ mod tests {
         }
 
         #[test]
-        fn stop_sequence_growing() {
+        #[should_panic(
+            expected = "DuplicateStopSequence { vj_id: \"vj1\", duplicated_sequence: 2 }"
+        )]
+        fn growing_sequences() {
             let stop_times = generate_stop_times(vec![
-                (1, "06:00:00", "06:00:00"),
-                (2, "06:06:27", "06:06:27"),
-                (3, "06:07:27", "06:07:27"),
-                (3, "06:08:27", "06:08:27"),
-                (3, "06:09:27", "06:09:27"),
+                (1, Some("06:00:00"), Some("06:01:00"), None, None),
+                (2, Some("06:02:00"), Some("06:03:00"), None, None),
+                (2, Some("06:04:00"), Some("06:05:00"), None, None),
             ]);
             let mut vehicle_journey = VehicleJourney {
                 id: "vj1".to_string(),
                 stop_times,
                 ..Default::default()
             };
-            let error = vehicle_journey.sort_and_check_stop_times().unwrap_err();
-            let _expected_vj_id = "vj1".to_string();
-            let _expected_duplicated_sequence = 2;
-            assert!(matches!(
-                error,
-                StopTimeError::DuplicateStopSequence {
-                    vj_id: _expected_vj_id,
-                    duplicated_sequence: _expected_duplicated_sequence,
-                }
-            ));
+            vehicle_journey.sort_and_check_stop_times().unwrap();
+        }
+
+        #[test]
+        #[should_panic(
+            expected = "IncoherentStopTimes { vj_id: \"vj1\", first_incorrect_sequence: 2, first_incorrect_time: Time(21960) }"
+        )]
+        fn growing_departure_to_arrival_time() {
+            let stop_times = generate_stop_times(vec![
+                (1, Some("06:00:00"), Some("06:01:00"), None, None),
+                (2, Some("06:02:00"), Some("06:06:00"), None, None),
+                (3, Some("06:04:00"), Some("06:05:00"), None, None),
+            ]);
+            let mut vehicle_journey = VehicleJourney {
+                id: "vj1".to_string(),
+                stop_times,
+                ..Default::default()
+            };
+            vehicle_journey.sort_and_check_stop_times().unwrap();
+        }
+
+        #[test]
+        #[should_panic(
+            expected = "IncoherentStopTimes { vj_id: \"vj1\", first_incorrect_sequence: 2, first_incorrect_time: Time(73800) }"
+        )]
+        fn growing_start_pickup_drop_off_windows() {
+            let stop_times = generate_stop_times(vec![
+                (1, None, None, Some("20:30:00"), Some("22:00:00")),
+                (2, None, None, Some("20:30:00"), Some("22:00:00")),
+                (3, None, None, Some("19:30:00"), Some("22:00:00")),
+            ]);
+            let mut vehicle_journey = VehicleJourney {
+                id: "vj1".to_string(),
+                stop_times,
+                ..Default::default()
+            };
+            vehicle_journey.sort_and_check_stop_times().unwrap();
+        }
+
+        #[test]
+        #[should_panic(
+            expected = "IncoherentStopTimes { vj_id: \"vj1\", first_incorrect_sequence: 2, first_incorrect_time: Time(23400) }"
+        )]
+        fn growing_end_pickup_drop_off_windows() {
+            let stop_times = generate_stop_times(vec![
+                (1, None, None, Some("06:30:00"), Some("08:00:00")),
+                (2, None, None, Some("06:30:00"), Some("08:00:00")),
+                (3, None, None, Some("06:30:00"), Some("07:00:00")),
+            ]);
+            let mut vehicle_journey = VehicleJourney {
+                id: "vj1".to_string(),
+                stop_times,
+                ..Default::default()
+            };
+            vehicle_journey.sort_and_check_stop_times().unwrap();
         }
+
+        #[test]
+        #[should_panic(
+            expected = "IncoherentStopTimes { vj_id: \"vj1\", first_incorrect_sequence: 2, first_incorrect_time: Time(21780) }"
+        )]
+        fn growing_departure_to_start_pickup_drop_off_windows() {
+            let stop_times = generate_stop_times(vec![
+                (1, Some("06:00:00"), Some("06:01:00"), None, None),
+                (2, Some("06:02:00"), Some("06:03:00"), None, None),
+                (3, None, None, Some("06:00:00"), Some("07:00:00")),
+            ]);
+            let mut vehicle_journey = VehicleJourney {
+                id: "vj1".to_string(),
+                stop_times,
+                ..Default::default()
+            };
+            vehicle_journey.sort_and_check_stop_times().unwrap();
+        }
+
         #[test]
-        fn stop_times_growing() {
+        #[should_panic(
+            expected = "IncoherentStopTimes { vj_id: \"vj1\", first_incorrect_sequence: 2, first_incorrect_time: Time(21600) }"
+        )]
+        fn growing_end_pickup_drop_off_windows_to_arrival() {
             let stop_times = generate_stop_times(vec![
-                (1, "06:00:00", "06:00:00"),
-                (2, "06:06:27", "06:06:27"),
-                (3, "06:06:00", "06:06:27"),
-                (4, "06:06:27", "06:06:27"),
-                (5, "06:06:27", "06:06:27"),
+                (1, None, None, Some("06:00:00"), Some("07:00:00")),
+                (2, None, None, Some("06:00:00"), Some("07:00:00")),
+                (3, Some("06:45:00"), Some("06:45:00"), None, None),
             ]);
             let mut vehicle_journey = VehicleJourney {
                 id: "vj1".to_string(),
                 stop_times,
                 ..Default::default()
             };
-            let error = vehicle_journey.sort_and_check_stop_times().unwrap_err();
-            let _expected_vj_id = "vj1".to_string();
-            let _expected_first_incorrect_sequence = 2;
-            let _expected_first_incorrect_time = Time::new(6, 6, 27);
-            assert!(matches!(
-                error,
-                StopTimeError::IncoherentStopTimes {
-                    vj_id: _expected_vj_id,
-                    first_incorrect_sequence: _expected_first_incorrect_sequence,
-                    first_incorrect_time: _expected_first_incorrect_time,
-                },
-            ));
+            vehicle_journey.sort_and_check_stop_times().unwrap();
         }
     }
 }
diff --git a/tests/fixtures/netex_france/output_netexfr_pickup_drop_off_windows/lignes.xml b/tests/fixtures/netex_france/output_netexfr_pickup_drop_off_windows/lignes.xml
new file mode 100644
index 000000000..20a075ed6
--- /dev/null
+++ b/tests/fixtures/netex_france/output_netexfr_pickup_drop_off_windows/lignes.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PublicationDelivery version="1.09:FR-NETEX_LIGNE-2.1-1.0" xmlns="http://www.netex.org.uk/netex" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.netex.org.uk/netex">
+	<PublicationTimestamp>2024-04-03T17:19:00+00:00</PublicationTimestamp>
+	<ParticipantRef>Participant</ParticipantRef>
+	<dataObjects>
+		<CompositeFrame id="FR:CompositeFrame:NETEX_LIGNE:" version="any">
+			<frames>
+				<ServiceFrame id="FR:ServiceFrame:MFDI:1071:" version="any">
+					<Network id="FR:Network:MFDI_1071:" version="any">
+						<Name>Roissy Ouest</Name>
+						<members>
+							<LineRef ref="FR:Line:MFDI_C02060:">
+							</LineRef>
+						</members>
+					</Network>
+				</ServiceFrame>
+				<ServiceFrame id="FR:ServiceFrame:MFDI:Operator_100:" version="any">
+					<Network id="FR:Network:MFDI_Operator_100:" version="any">
+						<Name>RATP</Name>
+						<members>
+							<LineRef ref="FR:Line:MFDI_C01376:">
+							</LineRef>
+						</members>
+					</Network>
+				</ServiceFrame>
+				<ServiceFrame id="FR:ServiceFrame:lines:" version="any">
+					<lines>
+						<Line id="FR:Line:MFDI_C01376:" version="any">
+							<Name>6</Name>
+							<TransportMode>metro</TransportMode>
+							<PublicCode>6</PublicCode>
+						</Line>
+						<Line id="FR:Line:MFDI_C02060:" version="any">
+							<Name>Filéo Roissy Sud - Villeparisis et Mitry (sur réservation)</Name>
+							<TransportMode>bus</TransportMode>
+							<PublicCode>Filéo RS</PublicCode>
+						</Line>
+					</lines>
+				</ServiceFrame>
+				<ResourceFrame id="FR:ResourceFrame:operators:" version="any">
+					<organisations>
+						<Operator id="FR:Operator:MFDI_100:" version="any">
+							<Name>RATP</Name>
+							<ContactDetails>
+							</ContactDetails>
+							<OrganisationType>other</OrganisationType>
+						</Operator>
+						<Operator id="FR:Operator:MFDI_1028:" version="any">
+							<Name>Keolis Roissy Pays de France Ouest</Name>
+							<ContactDetails>
+							</ContactDetails>
+							<OrganisationType>other</OrganisationType>
+						</Operator>
+					</organisations>
+				</ResourceFrame>
+			</frames>
+		</CompositeFrame>
+	</dataObjects>
+</PublicationDelivery>
\ No newline at end of file
diff --git a/tests/fixtures/ntfs_with_windows/input/networks.txt b/tests/fixtures/ntfs_with_windows/input/networks.txt
deleted file mode 100644
index 6d82bb8f7..000000000
--- a/tests/fixtures/ntfs_with_windows/input/networks.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-network_id,network_name,network_url,network_timezone,network_lang,network_phone,network_address,network_fare_url,network_sort_order
-MFDI:1061,Vélizy Vallées,https://www.iledefrance-mobilites.fr,Europe/Paris,,,,https://applidium.page.link/default,
-MFDI:1071,Roissy Ouest,https://www.iledefrance-mobilites.fr,Europe/Paris,,,,https://applidium.page.link/default,
-MFDI:1062,Saint Germain Boucles de Seine,https://www.iledefrance-mobilites.fr,Europe/Paris,,,,https://applidium.page.link/default,
-MFDI:Operator_100,RATP,https://www.iledefrance-mobilites.fr,Europe/Paris,,,,https://applidium.page.link/default,
diff --git a/tests/fixtures/ntfs_with_windows/input/object_codes.txt b/tests/fixtures/ntfs_with_windows/input/object_codes.txt
deleted file mode 100644
index 9727314a6..000000000
--- a/tests/fixtures/ntfs_with_windows/input/object_codes.txt
+++ /dev/null
@@ -1,211 +0,0 @@
-object_type,object_id,object_system,object_code
-stop_area,MFDI:461827,source,FR::multimodalStopPlace:461827:FR1
-stop_area,MFDI:426072,source,FR::multimodalStopPlace:426072:FR1
-stop_area,MFDI:71639,source,FR::multimodalStopPlace:71639:FR1
-stop_area,MFDI:71673,TN_PA,484
-stop_area,MFDI:71673,source,FR::multimodalStopPlace:71673:FR1
-stop_area,MFDI:64589,TN_PA,476
-stop_area,MFDI:64589,source,FR::multimodalStopPlace:64589:FR1
-stop_area,MFDI:63880,TN_PA,210
-stop_area,MFDI:63880,source,FR::multimodalStopPlace:63880:FR1
-stop_area,MFDI:71026,source,FR::multimodalStopPlace:71026:FR1
-stop_area,MFDI:64509,source,FR::multimodalStopPlace:64509:FR1
-stop_area,MFDI:64485,source,FR::multimodalStopPlace:64485:FR1
-stop_area,MFDI:63534,source,FR::multimodalStopPlace:63534:FR1
-stop_area,MFDI:63529,source,FR::multimodalStopPlace:63529:FR1
-stop_area,MFDI:63438,source,FR::multimodalStopPlace:63438:FR1
-stop_area,MFDI:73556,source,FR::multimodalStopPlace:73556:FR1
-stop_area,MFDI:73596,TN_PA,376
-stop_area,MFDI:73596,source,FR::multimodalStopPlace:73596:FR1
-stop_area,MFDI:73591,source,FR::multimodalStopPlace:73591:FR1
-stop_area,MFDI:71347,TN_PA,482
-stop_area,MFDI:71347,source,FR::multimodalStopPlace:71347:FR1
-stop_area,MFDI:73486,source,FR::multimodalStopPlace:73486:FR1
-stop_area,MFDI:71199,source,FR::multimodalStopPlace:71199:FR1
-stop_area,MFDI:480959,source,FR::multimodalStopPlace:480959:FR1
-stop_point,MFDI:22167,netex_monomodal_stopplace,monomodalStopPlace:44334
-stop_point,MFDI:22167,netex_zder_quay,22167
-stop_point,MFDI:22167,netex_zder_quay,463098
-stop_point,MFDI:22167,netex_zder_quay,monomodalStopPlace:44334
-stop_point,MFDI:22167,source,FR::Quay:22167:FR1
-stop_point,MFDI:22173,netex_monomodal_stopplace,monomodalStopPlace:45276
-stop_point,MFDI:22173,netex_zder_quay,22173
-stop_point,MFDI:22173,netex_zder_quay,463186
-stop_point,MFDI:22173,netex_zder_quay,monomodalStopPlace:45276
-stop_point,MFDI:22173,source,FR::Quay:22173:FR1
-stop_point,MFDI:22073,netex_monomodal_stopplace,monomodalStopPlace:462358
-stop_point,MFDI:22073,netex_zder_quay,21919
-stop_point,MFDI:22073,netex_zder_quay,22072
-stop_point,MFDI:22073,netex_zder_quay,22073
-stop_point,MFDI:22073,netex_zder_quay,22080
-stop_point,MFDI:22073,netex_zder_quay,462942
-stop_point,MFDI:22073,netex_zder_quay,462943
-stop_point,MFDI:22073,netex_zder_quay,463028
-stop_point,MFDI:22073,netex_zder_quay,463067
-stop_point,MFDI:22073,netex_zder_quay,monomodalStopPlace:462358
-stop_point,MFDI:22073,source,FR::Quay:22073:FR1
-stop_point,MFDI:41403,netex_monomodal_stopplace,monomodalStopPlace:425035
-stop_point,MFDI:41403,netex_zder_quay,41403
-stop_point,MFDI:41403,netex_zder_quay,472884
-stop_point,MFDI:41403,netex_zder_quay,monomodalStopPlace:425035
-stop_point,MFDI:41403,source,FR::Quay:41403:FR1
-stop_point,MFDI:463194,netex_monomodal_stopplace,monomodalStopPlace:43566
-stop_point,MFDI:463194,netex_zder_quay,21969
-stop_point,MFDI:463194,netex_zder_quay,22162
-stop_point,MFDI:463194,netex_zder_quay,22183
-stop_point,MFDI:463194,netex_zder_quay,463194
-stop_point,MFDI:463194,netex_zder_quay,463201
-stop_point,MFDI:463194,netex_zder_quay,463202
-stop_point,MFDI:463194,netex_zder_quay,monomodalStopPlace:43566
-stop_point,MFDI:463194,source,FR::Quay:463194:FR1
-stop_point,MFDI:463042,netex_monomodal_stopplace,monomodalStopPlace:477682
-stop_point,MFDI:463042,netex_zder_quay,22086
-stop_point,MFDI:463042,netex_zder_quay,22094
-stop_point,MFDI:463042,netex_zder_quay,22095
-stop_point,MFDI:463042,netex_zder_quay,463013
-stop_point,MFDI:463042,netex_zder_quay,463042
-stop_point,MFDI:463042,netex_zder_quay,463043
-stop_point,MFDI:463042,netex_zder_quay,monomodalStopPlace:477682
-stop_point,MFDI:463042,source,FR::Quay:463042:FR1
-stop_point,MFDI:426813,netex_monomodal_stopplace,monomodalStopPlace:462743
-stop_point,MFDI:426813,netex_zder_quay,13070
-stop_point,MFDI:426813,netex_zder_quay,13071
-stop_point,MFDI:426813,netex_zder_quay,14651
-stop_point,MFDI:426813,netex_zder_quay,34203
-stop_point,MFDI:426813,netex_zder_quay,35054
-stop_point,MFDI:426813,netex_zder_quay,426791
-stop_point,MFDI:426813,netex_zder_quay,426806
-stop_point,MFDI:426813,netex_zder_quay,426807
-stop_point,MFDI:426813,netex_zder_quay,426812
-stop_point,MFDI:426813,netex_zder_quay,426813
-stop_point,MFDI:426813,netex_zder_quay,426814
-stop_point,MFDI:426813,netex_zder_quay,427388
-stop_point,MFDI:426813,netex_zder_quay,471706
-stop_point,MFDI:426813,netex_zder_quay,477638
-stop_point,MFDI:426813,netex_zder_quay,477718
-stop_point,MFDI:426813,netex_zder_quay,477719
-stop_point,MFDI:426813,netex_zder_quay,485088
-stop_point,MFDI:426813,netex_zder_quay,487504
-stop_point,MFDI:426813,netex_zder_quay,488050
-stop_point,MFDI:426813,netex_zder_quay,488255
-stop_point,MFDI:426813,netex_zder_quay,488256
-stop_point,MFDI:426813,netex_zder_quay,monomodalStopPlace:462743
-stop_point,MFDI:426813,source,FR::Quay:426813:FR1
-stop_point,MFDI:426214,netex_monomodal_stopplace,monomodalStopPlace:57672
-stop_point,MFDI:426214,netex_zder_quay,20300
-stop_point,MFDI:426214,netex_zder_quay,426214
-stop_point,MFDI:426214,netex_zder_quay,monomodalStopPlace:57672
-stop_point,MFDI:426214,source,FR::Quay:426214:FR1
-stop_point,MFDI:477725,netex_monomodal_stopplace,monomodalStopPlace:480958
-stop_point,MFDI:477725,netex_zder_quay,477725
-stop_point,MFDI:477725,netex_zder_quay,monomodalStopPlace:480958
-stop_point,MFDI:477725,source,FR::Quay:477725:FR1
-stop_point,MFDI:34582,netex_monomodal_stopplace,monomodalStopPlace:54733
-stop_point,MFDI:34582,netex_zder_quay,34582
-stop_point,MFDI:34582,netex_zder_quay,34719
-stop_point,MFDI:34582,netex_zder_quay,monomodalStopPlace:54733
-stop_point,MFDI:34582,source,FR::Quay:34582:FR1
-stop_point,MFDI:38175,netex_monomodal_stopplace,monomodalStopPlace:44262
-stop_point,MFDI:38175,netex_zder_quay,38175
-stop_point,MFDI:38175,netex_zder_quay,40739
-stop_point,MFDI:38175,netex_zder_quay,monomodalStopPlace:44262
-stop_point,MFDI:38175,source,FR::Quay:38175:FR1
-stop_point,MFDI:461909,netex_monomodal_stopplace,monomodalStopPlace:473812
-stop_point,MFDI:461909,netex_zder_quay,13497
-stop_point,MFDI:461909,netex_zder_quay,34498
-stop_point,MFDI:461909,netex_zder_quay,34605
-stop_point,MFDI:461909,netex_zder_quay,34610
-stop_point,MFDI:461909,netex_zder_quay,34657
-stop_point,MFDI:461909,netex_zder_quay,34658
-stop_point,MFDI:461909,netex_zder_quay,35033
-stop_point,MFDI:461909,netex_zder_quay,461909
-stop_point,MFDI:461909,netex_zder_quay,481823
-stop_point,MFDI:461909,netex_zder_quay,491803
-stop_point,MFDI:461909,netex_zder_quay,monomodalStopPlace:473812
-stop_point,MFDI:461909,source,FR::Quay:461909:FR1
-stop_point,MFDI:18995,netex_monomodal_stopplace,monomodalStopPlace:57333
-stop_point,MFDI:18995,netex_zder_quay,18995
-stop_point,MFDI:18995,netex_zder_quay,19563
-stop_point,MFDI:18995,netex_zder_quay,monomodalStopPlace:57333
-stop_point,MFDI:18995,source,FR::Quay:18995:FR1
-stop_point,MFDI:34605,netex_monomodal_stopplace,monomodalStopPlace:473812
-stop_point,MFDI:34605,netex_zder_quay,13497
-stop_point,MFDI:34605,netex_zder_quay,34498
-stop_point,MFDI:34605,netex_zder_quay,34605
-stop_point,MFDI:34605,netex_zder_quay,34610
-stop_point,MFDI:34605,netex_zder_quay,34657
-stop_point,MFDI:34605,netex_zder_quay,34658
-stop_point,MFDI:34605,netex_zder_quay,35033
-stop_point,MFDI:34605,netex_zder_quay,461909
-stop_point,MFDI:34605,netex_zder_quay,481823
-stop_point,MFDI:34605,netex_zder_quay,491803
-stop_point,MFDI:34605,netex_zder_quay,monomodalStopPlace:473812
-stop_point,MFDI:34605,source,FR::Quay:34605:FR1
-stop_point,MFDI:34744,netex_monomodal_stopplace,monomodalStopPlace:44620
-stop_point,MFDI:34744,netex_zder_quay,34744
-stop_point,MFDI:34744,netex_zder_quay,34745
-stop_point,MFDI:34744,netex_zder_quay,monomodalStopPlace:44620
-stop_point,MFDI:34744,source,FR::Quay:34744:FR1
-stop_point,MFDI:11584,netex_monomodal_stopplace,monomodalStopPlace:52901
-stop_point,MFDI:11584,netex_zder_quay,11584
-stop_point,MFDI:11584,netex_zder_quay,11585
-stop_point,MFDI:11584,netex_zder_quay,monomodalStopPlace:52901
-stop_point,MFDI:11584,source,FR::Quay:11584:FR1
-stop_point,MFDI:14081,netex_monomodal_stopplace,monomodalStopPlace:45016
-stop_point,MFDI:14081,netex_zder_quay,14081
-stop_point,MFDI:14081,netex_zder_quay,monomodalStopPlace:45016
-stop_point,MFDI:14081,source,FR::Quay:14081:FR1
-stop_point,MFDI:20324,netex_monomodal_stopplace,monomodalStopPlace:57680
-stop_point,MFDI:20324,netex_zder_quay,20324
-stop_point,MFDI:20324,netex_zder_quay,20325
-stop_point,MFDI:20324,netex_zder_quay,monomodalStopPlace:57680
-stop_point,MFDI:20324,source,FR::Quay:20324:FR1
-stop_point,MFDI:20312,netex_monomodal_stopplace,monomodalStopPlace:46420
-stop_point,MFDI:20312,netex_zder_quay,20312
-stop_point,MFDI:20312,netex_zder_quay,20313
-stop_point,MFDI:20312,netex_zder_quay,monomodalStopPlace:46420
-stop_point,MFDI:20312,source,FR::Quay:20312:FR1
-stop_point,MFDI:485179,netex_monomodal_stopplace,monomodalStopPlace:477262
-stop_point,MFDI:485179,netex_zder_quay,477079
-stop_point,MFDI:485179,netex_zder_quay,477080
-stop_point,MFDI:485179,netex_zder_quay,477194
-stop_point,MFDI:485179,netex_zder_quay,477497
-stop_point,MFDI:485179,netex_zder_quay,477499
-stop_point,MFDI:485179,netex_zder_quay,477886
-stop_point,MFDI:485179,netex_zder_quay,479496
-stop_point,MFDI:485179,netex_zder_quay,479497
-stop_point,MFDI:485179,netex_zder_quay,485179
-stop_point,MFDI:485179,netex_zder_quay,491506
-stop_point,MFDI:485179,netex_zder_quay,491507
-stop_point,MFDI:485179,netex_zder_quay,monomodalStopPlace:477262
-stop_point,MFDI:485179,source,FR::Quay:485179:FR1
-network,MFDI:1061,source,FR1:Network:1061:LOC
-network,MFDI:1071,source,FR1:Network:1071:LOC
-network,MFDI:1062,source,FR1:Network:1062:LOC
-network,MFDI:Operator_100,source,FR1:Operator:100:LOC
-line,MFDI:C01376,Netex_PrivateCode,100110006
-line,MFDI:C01376,source,FR1:Line:C01376:
-line,MFDI:C02060,Netex_PrivateCode,116277010
-line,MFDI:C02060,source,FR1:Line:C02060:
-line,MFDI:C02491,Netex_PrivateCode,532532100
-line,MFDI:C02491,source,FR1:Line:C02491:
-line,MFDI:C02513,Netex_PrivateCode,000527266
-line,MFDI:C02513,source,FR1:Line:C02513:
-route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,Netex_ServiceJourneyPattern,RATP:ServiceJourneyPattern:107494-C01376-MISS_RATP_C01376_-1163221766:LOC
-route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,Netex_ServiceJourneyPattern,RATP:ServiceJourneyPattern:107494-C01376-MISS_RATP_C01376_-1646701812:LOC
-route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,Netex_ServiceJourneyPattern,RATP:ServiceJourneyPattern:107494-C01376-MISS_RATP_C01376_-1818959048:LOC
-route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,Netex_ServiceJourneyPattern,RATP:ServiceJourneyPattern:107494-C01376-MISS_RATP_C01376_1351424965:LOC
-route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,source,RATP:Route:107494-C01376-ITI_IDFM_C01376_A_-1009412783:LOC
-route,MFDI:KVVB:C02513-SOIR-A,Netex_ServiceJourneyPattern,KVVB:ServiceJourneyPattern:158023-C02513-DWH-C02513-SOIR-A-02:LOC
-route,MFDI:KVVB:C02513-SOIR-A,source,KVVB:Route:C02513-SOIR-A:LOC
-route,MFDI:BOUCLE_DE_LYS:82336-C02491-4740-ALLER,Netex_ServiceJourneyPattern,BOUCLE_DE_LYS:ServiceJourneyPattern:82336-C02491-41025:LOC
-route,MFDI:BOUCLE_DE_LYS:82336-C02491-4740-ALLER,source,BOUCLE_DE_LYS:Route:82336-C02491-4740-ALLER:LOC
-route,MFDI:stif:local-153359-C02060-3417,Netex_ServiceJourneyPattern,KRO6:ServiceJourneyPattern:153358-C02060-DWH-C02060-F12-A-02:LOC
-route,MFDI:stif:local-153359-C02060-3417,Netex_ServiceJourneyPattern,KRO6:ServiceJourneyPattern:153358-C02060-DWH-C02060-F12-A-03:LOC
-route,MFDI:stif:local-153359-C02060-3417,Netex_ServiceJourneyPattern,KRO6:ServiceJourneyPattern:153358-C02060-DWH-C02060-F12-A-06:LOC
-route,MFDI:stif:local-153359-C02060-3417,Netex_ServiceJourneyPattern,KRO6:ServiceJourneyPattern:153358-C02060-DWH-C02060-F12-A-07:LOC
-route,MFDI:stif:local-153359-C02060-3417,source,stif:Route:local-153359-C02060-3417:LOC
-trip,MFDI:KVVB:158023-C02513-1638-260,source,KVVB:ServiceJourney:158023-C02513-1638-260:LOC
-trip,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,source,BOUCLE_DE_LYS:ServiceJourney:149996-C02491-18777678:LOC
-trip,MFDI:KRO6:153358-C02060-680-260,source,KRO6:ServiceJourney:153358-C02060-680-260:LOC
-trip,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,source,RATP:ServiceJourney:153912-C01376-COU_RATP_5086613_2991428_116:LOC
diff --git a/tests/fixtures/ntfs_with_windows/input/booking_rule_links.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/booking_rule_links.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/booking_rule_links.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/booking_rule_links.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/booking_rules.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/booking_rules.txt
similarity index 80%
rename from tests/fixtures/ntfs_with_windows/input/booking_rules.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/booking_rules.txt
index 92b6816d3..c1986757b 100644
--- a/tests/fixtures/ntfs_with_windows/input/booking_rules.txt
+++ b/tests/fixtures/pickup_drop_off_windows/input_ntfs/booking_rules.txt
@@ -1,4 +1,4 @@
 booking_rule_id,name,info_url,phone_number,message,booking_url
 MFDI:10,sans_reservation,,,"Bus de soirée : Le service fonctionne sans réservation, il suffit d'indiquer l'arrêt de descente au conducteur",
-MFDI:11,avec_reservation,https://www.fileo.com/se-deplacer/reserver-votre-fileo/,01 74 37 24 77,24h/24 et 7j/7,
+MFDI:11,avec_reservation,https://www.fileo.com/se-deplacer/reserver-votre-fileo/,01 74 37 24 77,24h/24 et 7j/7,https://www.fileo.com/tad
 MFDI:12,sans_reservation,,,,
diff --git a/tests/fixtures/pickup_drop_off_windows/input_ntfs/calendar.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/calendar.txt
new file mode 100644
index 000000000..01fd2617d
--- /dev/null
+++ b/tests/fixtures/pickup_drop_off_windows/input_ntfs/calendar.txt
@@ -0,0 +1,3 @@
+service_id,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date
+MFDI:1,1,1,1,1,1,0,0,20240916,20241015
+MFDI:1000,1,1,1,1,1,1,1,20240916,20241015
diff --git a/tests/fixtures/ntfs_with_windows/input/commercial_modes.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/commercial_modes.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/commercial_modes.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/commercial_modes.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/companies.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/companies.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/companies.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/companies.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/contributors.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/contributors.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/contributors.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/contributors.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/datasets.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/datasets.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/datasets.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/datasets.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/equipments.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/equipments.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/equipments.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/equipments.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/feed_infos.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/feed_infos.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/feed_infos.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/feed_infos.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/lines.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/lines.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/lines.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/lines.txt
diff --git a/tests/fixtures/pickup_drop_off_windows/input_ntfs/networks.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/networks.txt
new file mode 100644
index 000000000..a639c34cc
--- /dev/null
+++ b/tests/fixtures/pickup_drop_off_windows/input_ntfs/networks.txt
@@ -0,0 +1,5 @@
+network_id,network_name,network_url,network_timezone,network_lang,network_phone,network_address,network_fare_url,network_sort_order
+MFDI:1061,Vélizy Vallées,,Europe/Paris,,,,,
+MFDI:1071,Roissy Ouest,,Europe/Paris,,,,,
+MFDI:1062,Saint Germain Boucles de Seine,,Europe/Paris,,,,,
+MFDI:Operator_100,RATP,,Europe/Paris,,,,,
diff --git a/tests/fixtures/pickup_drop_off_windows/input_ntfs/object_codes.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/object_codes.txt
new file mode 100644
index 000000000..8be59cc37
--- /dev/null
+++ b/tests/fixtures/pickup_drop_off_windows/input_ntfs/object_codes.txt
@@ -0,0 +1,56 @@
+object_type,object_id,object_system,object_code
+stop_area,MFDI:461827,source,FR::multimodalStopPlace:461827:FR1
+stop_area,MFDI:426072,source,FR::multimodalStopPlace:426072:FR1
+stop_area,MFDI:71639,source,FR::multimodalStopPlace:71639:FR1
+stop_area,MFDI:71673,source,FR::multimodalStopPlace:71673:FR1
+stop_area,MFDI:64589,source,FR::multimodalStopPlace:64589:FR1
+stop_area,MFDI:63880,source,FR::multimodalStopPlace:63880:FR1
+stop_area,MFDI:71026,source,FR::multimodalStopPlace:71026:FR1
+stop_area,MFDI:64509,source,FR::multimodalStopPlace:64509:FR1
+stop_area,MFDI:64485,source,FR::multimodalStopPlace:64485:FR1
+stop_area,MFDI:63534,source,FR::multimodalStopPlace:63534:FR1
+stop_area,MFDI:63529,source,FR::multimodalStopPlace:63529:FR1
+stop_area,MFDI:63438,source,FR::multimodalStopPlace:63438:FR1
+stop_area,MFDI:73556,source,FR::multimodalStopPlace:73556:FR1
+stop_area,MFDI:73596,source,FR::multimodalStopPlace:73596:FR1
+stop_area,MFDI:73591,source,FR::multimodalStopPlace:73591:FR1
+stop_area,MFDI:71347,source,FR::multimodalStopPlace:71347:FR1
+stop_area,MFDI:73486,source,FR::multimodalStopPlace:73486:FR1
+stop_area,MFDI:71199,source,FR::multimodalStopPlace:71199:FR1
+stop_area,MFDI:480959,source,FR::multimodalStopPlace:480959:FR1
+stop_point,MFDI:22167,source,FR::Quay:22167:FR1
+stop_point,MFDI:22173,source,FR::Quay:22173:FR1
+stop_point,MFDI:22073,source,FR::Quay:22073:FR1
+stop_point,MFDI:41403,source,FR::Quay:41403:FR1
+stop_point,MFDI:463194,source,FR::Quay:463194:FR1
+stop_point,MFDI:463042,source,FR::Quay:463042:FR1
+stop_point,MFDI:426813,source,FR::Quay:426813:FR1
+stop_point,MFDI:426214,source,FR::Quay:426214:FR1
+stop_point,MFDI:477725,source,FR::Quay:477725:FR1
+stop_point,MFDI:34582,source,FR::Quay:34582:FR1
+stop_point,MFDI:38175,source,FR::Quay:38175:FR1
+stop_point,MFDI:461909,source,FR::Quay:461909:FR1
+stop_point,MFDI:18995,source,FR::Quay:18995:FR1
+stop_point,MFDI:34605,source,FR::Quay:34605:FR1
+stop_point,MFDI:34744,source,FR::Quay:34744:FR1
+stop_point,MFDI:11584,source,FR::Quay:11584:FR1
+stop_point,MFDI:14081,source,FR::Quay:14081:FR1
+stop_point,MFDI:20324,source,FR::Quay:20324:FR1
+stop_point,MFDI:20312,source,FR::Quay:20312:FR1
+stop_point,MFDI:485179,source,FR::Quay:485179:FR1
+network,MFDI:1061,source,FR1:Network:1061:LOC
+network,MFDI:1071,source,FR1:Network:1071:LOC
+network,MFDI:1062,source,FR1:Network:1062:LOC
+network,MFDI:Operator_100,source,FR1:Operator:100:LOC
+line,MFDI:C01376,source,FR1:Line:C01376:
+line,MFDI:C02060,source,FR1:Line:C02060:
+line,MFDI:C02491,source,FR1:Line:C02491:
+line,MFDI:C02513,source,FR1:Line:C02513:
+route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,source,RATP:Route:107494-C01376-ITI_IDFM_C01376_A_-1009412783:LOC
+route,MFDI:KVVB:C02513-SOIR-A,source,KVVB:Route:C02513-SOIR-A:LOC
+route,MFDI:BOUCLE_DE_LYS:82336-C02491-4740-ALLER,source,BOUCLE_DE_LYS:Route:82336-C02491-4740-ALLER:LOC
+route,MFDI:stif:local-153359-C02060-3417,source,stif:Route:local-153359-C02060-3417:LOC
+trip,MFDI:KVVB:158023-C02513-1638-260,source,KVVB:ServiceJourney:158023-C02513-1638-260:LOC
+trip,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,source,BOUCLE_DE_LYS:ServiceJourney:149996-C02491-18777678:LOC
+trip,MFDI:KRO6:153358-C02060-680-260,source,KRO6:ServiceJourney:153358-C02060-680-260:LOC
+trip,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,source,RATP:ServiceJourney:153912-C01376-COU_RATP_5086613_2991428_116:LOC
diff --git a/tests/fixtures/ntfs_with_windows/input/physical_modes.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/physical_modes.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/physical_modes.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/physical_modes.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/routes.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/routes.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/routes.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/routes.txt
diff --git a/tests/fixtures/ntfs_with_windows/output/stop_times.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/stop_times.txt
similarity index 91%
rename from tests/fixtures/ntfs_with_windows/output/stop_times.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/stop_times.txt
index af3d61dc2..cc4137320 100644
--- a/tests/fixtures/ntfs_with_windows/output/stop_times.txt
+++ b/tests/fixtures/pickup_drop_off_windows/input_ntfs/stop_times.txt
@@ -1,6 +1,6 @@
 stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision
-MFDI:485179,MFDI:KVVB:158023-C02513-1638-260,0,22:30:00,22:30:00,,,0,0,2,1,,,,0
-MFDI:426214,MFDI:KVVB:158023-C02513-1638-260,1,,,22:36:00,22:55:00,0,0,1,2,,,,2
+MFDI:485179,MFDI:KVVB:158023-C02513-1638-260,0,22:30:00,22:31:00,,,0,0,0,1,,,,0
+MFDI:426214,MFDI:KVVB:158023-C02513-1638-260,1,22:33:00,22:34:00,,,0,0,0,0,,,,0
 MFDI:20312,MFDI:KVVB:158023-C02513-1638-260,12,,,22:36:00,22:55:00,0,0,1,2,,,,2
 MFDI:20324,MFDI:KVVB:158023-C02513-1638-260,24,,,22:36:00,22:55:00,0,0,1,2,,,,2
 MFDI:11584,MFDI:KVVB:158023-C02513-1638-260,32,,,22:36:00,22:55:00,0,0,1,2,,,,2
diff --git a/tests/fixtures/ntfs_with_windows/input/stops.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/stops.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/stops.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/stops.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/transfers.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/transfers.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/transfers.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/transfers.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/trip_properties.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/trip_properties.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/trip_properties.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/trip_properties.txt
diff --git a/tests/fixtures/ntfs_with_windows/input/trips.txt b/tests/fixtures/pickup_drop_off_windows/input_ntfs/trips.txt
similarity index 100%
rename from tests/fixtures/ntfs_with_windows/input/trips.txt
rename to tests/fixtures/pickup_drop_off_windows/input_ntfs/trips.txt
diff --git a/tests/fixtures/ntfs_with_windows/output/lines.txt b/tests/fixtures/pickup_drop_off_windows/output_ntfs/lines.txt
similarity index 95%
rename from tests/fixtures/ntfs_with_windows/output/lines.txt
rename to tests/fixtures/pickup_drop_off_windows/output_ntfs/lines.txt
index fa8da0fd8..0ed47803b 100644
--- a/tests/fixtures/ntfs_with_windows/output/lines.txt
+++ b/tests/fixtures/pickup_drop_off_windows/output_ntfs/lines.txt
@@ -2,4 +2,4 @@ line_id,line_code,line_name,forward_line_name,backward_line_name,line_color,line
 MFDI:C01376,6,6,,,6ECA97,000000,,MFDI:Operator_100,Metro,,10:30:00,11:03:00
 MFDI:C02060,Filéo RS,Filéo Roissy Sud - Villeparisis et Mitry (sur réservation),,,4890CD,FFFFFF,,MFDI:1071,Bus,,02:39:00,03:15:00
 MFDI:C02491,Soir,Soir Saint-Germain-en-Laye,,,652C8F,FFFFFF,,MFDI:1062,Bus,,23:15:00,23:48:00
-MFDI:C02513,Soir,Soir Versailles-Chantiers,,,640082,FFFFFF,,MFDI:1061,Bus,,22:30:00,22:55:00
+MFDI:C02513,Soir,Soir Versailles-Chantiers,,,640082,FFFFFF,,MFDI:1061,Bus,,22:31:00,22:55:00
diff --git a/tests/fixtures/ntfs_with_windows/input/stop_times.txt b/tests/fixtures/pickup_drop_off_windows/output_ntfs/stop_times.txt
similarity index 91%
rename from tests/fixtures/ntfs_with_windows/input/stop_times.txt
rename to tests/fixtures/pickup_drop_off_windows/output_ntfs/stop_times.txt
index af3d61dc2..cc4137320 100644
--- a/tests/fixtures/ntfs_with_windows/input/stop_times.txt
+++ b/tests/fixtures/pickup_drop_off_windows/output_ntfs/stop_times.txt
@@ -1,6 +1,6 @@
 stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision
-MFDI:485179,MFDI:KVVB:158023-C02513-1638-260,0,22:30:00,22:30:00,,,0,0,2,1,,,,0
-MFDI:426214,MFDI:KVVB:158023-C02513-1638-260,1,,,22:36:00,22:55:00,0,0,1,2,,,,2
+MFDI:485179,MFDI:KVVB:158023-C02513-1638-260,0,22:30:00,22:31:00,,,0,0,0,1,,,,0
+MFDI:426214,MFDI:KVVB:158023-C02513-1638-260,1,22:33:00,22:34:00,,,0,0,0,0,,,,0
 MFDI:20312,MFDI:KVVB:158023-C02513-1638-260,12,,,22:36:00,22:55:00,0,0,1,2,,,,2
 MFDI:20324,MFDI:KVVB:158023-C02513-1638-260,24,,,22:36:00,22:55:00,0,0,1,2,,,,2
 MFDI:11584,MFDI:KVVB:158023-C02513-1638-260,32,,,22:36:00,22:55:00,0,0,1,2,,,,2
diff --git a/tests/read_ntfs.rs b/tests/read_ntfs.rs
index 7349458bb..90b05375a 100644
--- a/tests/read_ntfs.rs
+++ b/tests/read_ntfs.rs
@@ -559,13 +559,14 @@ fn ntfs_with_duplicated_objects_without_id() {
 
 #[test]
 fn preserve_stoptimes_windows_and_enhance_line_opening_time() {
-    let ntm = transit_model::ntfs::read("tests/fixtures/ntfs_with_windows/input/").unwrap();
+    let ntm =
+        transit_model::ntfs::read("tests/fixtures/pickup_drop_off_windows/input_ntfs/").unwrap();
     test_in_tmp_dir(|output_dir| {
         transit_model::ntfs::write(&ntm, output_dir, get_test_datetime()).unwrap();
         compare_output_dir_with_expected(
             output_dir,
             Some(vec!["lines.txt", "stop_times.txt"]),
-            "tests/fixtures/ntfs_with_windows/output",
+            "tests/fixtures/pickup_drop_off_windows/output_ntfs",
         );
     });
 }