diff --git a/OJP b/OJP
index 482625c..c12313a 160000
--- a/OJP
+++ b/OJP
@@ -1 +1 @@
-Subproject commit 482625caef9b099943d2c837dfa6aab5795d3606
+Subproject commit c12313a3220ef8639c753d0a8873ccf988214fff
diff --git a/examples/Holistic_Example_NeTEx_SIRI_OpRa/NeTEx_VR_Example.xml b/examples/Holistic_Example_NeTEx_SIRI_OpRa/NeTEx_VR_Example.xml
new file mode 100644
index 0000000..250f0e6
--- /dev/null
+++ b/examples/Holistic_Example_NeTEx_SIRI_OpRa/NeTEx_VR_Example.xml
@@ -0,0 +1,607 @@
+
+
+ 2022-02-15T09:30:46.0Z
+ VR
+
+
+ Example of encoding Simple SKDUPD Classic Train example in NeTEx
+
+
+ vr
+ http://www.operator.fi/
+ Operator's data
+
+
+
+
+
+ Europe/Helsinki
+ fi
+
+ 4326
+
+
+
+
+
+
+
+ RICS code
+ 0010
+
+
+ Valtionrautatiet
+ 0010
+
+
+ Manually added informationg through planning tool
+
+
+ Empirical data provided via OpRa
+
+
+
+
+
+
+ InterCity
+ rail
+ InterCity
+
+
+
+
+
+
+ 2800
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PT4M
+
+
+
+ PT9M
+
+
+
+ PT35M
+
+
+
+ PT28M
+
+
+
+ PT44M
+
+
+
+ PT15M
+
+
+
+ PT12M
+
+
+
+ PT26M
+
+
+
+ PT13M
+
+
+
+ PT22M
+
+
+
+ PT18M
+
+
+
+ PT37M
+
+
+
+
+
+
+ false
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ PT4M
+
+
+
+ PT9M
+
+
+
+ PT35M
+
+
+
+ PT28M
+
+
+
+ PT44M
+
+
+
+
+
+
+ false
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Manually added correction to the calculated time between stops
+
+
+ PT1M
+
+
+
+
+ Manually added correction to the calculated time between stops
+
+
+ PT2M10S
+
+
+
+
+ Planned waiting time of 1 minute
+
+
+ PT1M
+
+
+
+
+ Planned waiting time of 2 minute
+
+
+ PT2M
+
+
+
+
+ Planned waiting time of 3 minute
+
+
+ PT3M
+
+
+
+
+ Planned waiting time of 4 minute
+
+
+ PT4M
+
+
+
+
+
+
+ Uic Example of a very simple train timetable
+ rail
+
+
+ Classic Train
+ 1
+ rail
+
+ longDistance
+
+
+ 06:57:00
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Classic Train
+ 1
+ rail
+
+ longDistance
+
+
+ 06:57:00
+
+ 1
+
+
+
+
+
+
+
+ 06:57:00
+ 11:43:10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Date specific override that does not have the empirical timing
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example.xml b/examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example.xml
new file mode 100644
index 0000000..1b6792d
--- /dev/null
+++ b/examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example.xml
@@ -0,0 +1,406 @@
+
+
+
+ 2026-03-09T13:37:00Z
+
+
+ 2026-03-09T13:37:00Z
+
+ 2026-03-09T13:37:00Z
+ 2026-03-10T12:23:45.460852548+01:00
+
+
+
+ VR_InterCity.xml
+
+
+
+
+
+
+
+
+
+
+
+ PT6M30S
+
+
+
+ PT7M30S
+
+
+
+ PT35M
+
+
+
+ PT28M
+
+
+
+ PT44M
+
+
+
+ PT15M
+
+
+
+ PT12M
+
+
+
+ PT26M
+
+
+
+ PT13M
+
+
+
+ PT22M
+
+
+
+ PT18M
+
+
+
+ PT39M10S
+
+
+
+
+
+ PT1M30S
+
+
+
+ PT2M
+
+
+
+ PT2M
+
+
+
+ PT4M
+
+
+
+ PT2M
+
+
+
+ PT1M
+
+
+
+ PT3M
+
+
+
+ PT1M
+
+
+
+ PT2M
+
+
+
+ PT1M
+
+
+
+ PT1M
+
+
+
+
+
+
+ PT1M
+
+
+
+
+
+
+ PT1M30S
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PT4M
+
+
+
+ PT9M
+
+
+
+ PT35M
+
+
+
+ PT28M
+
+
+
+ PT44M
+
+
+
+ PT15M
+
+
+
+ PT12M
+
+
+
+ PT26M
+
+
+
+ PT13M
+
+
+
+ PT22M
+
+
+
+ PT18M
+
+
+
+ PT37M
+
+
+
+
+
+
+
+
+
+
+ 06:56:30
+
+
+
+
+
+
+ 07:03:00
+ false
+
+
+
+ 07:04:33
+
+
+
+
+
+
+ 07:12:00
+
+
+ 07:14:00
+
+
+
+
+
+
+ 07:49:00
+
+
+ 07:51:00
+
+
+
+
+
+
+ 08:19:00
+
+
+ 08:23:00
+
+
+
+
+
+
+ 09:07:00
+
+
+ 09:09:00
+
+
+
+
+
+
+ 09:24:00
+
+
+ 09:25:00
+
+
+
+
+
+
+ 09:37:00
+
+
+ 09:40:00
+
+
+
+
+
+
+ 10:06:00
+
+
+ 10:07:00
+
+
+
+
+
+
+ 10:20:00
+
+
+ 10:22:00
+
+
+
+
+
+
+ 10:44:00
+
+
+ 10:45:00
+
+
+
+
+
+
+ 11:03:00
+
+
+ 11:04:00
+
+
+
+
+
+
+ 11:43:10
+
+
+
+
+
+
+
+
+
+
+ 06:57:00
+
+
+
+ 07:02:00
+ 07:03:00
+
+
+
+ 07:12:00
+ 07:14:00
+
+
+
+ 07:49:00
+ 07:51:00
+
+
+
+ 08:19:00
+ 08:23:00
+
+
+
+ 09:07:00
+ 09:09:00
+
+
+
+ 09:24:00
+ 09:25:00
+
+
+
+ 09:37:00
+ 09:40:00
+
+
+
+ 10:06:00
+ 10:07:00
+
+
+
+ 10:20:00
+ 10:22:00
+
+
+
+ 10:44:00
+ 10:45:00
+
+
+
+ 11:03:00
+ 11:04:00
+
+
+
+ 11:43:00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example_Clean.xml b/examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example_Clean.xml
new file mode 100644
index 0000000..23f11aa
--- /dev/null
+++ b/examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example_Clean.xml
@@ -0,0 +1,263 @@
+
+
+
+
+ 2026-03-09T13:37:00Z
+
+
+
+ 2026-03-09T13:37:00Z
+
+
+ 2026-03-09T13:37:00Z
+ VR-Observed-2026-01-04
+
+
+
+
+
+
+
+
+
+ www.SIRI_MESSAGE_DATABASE.com
+
+
+
+
+
+
+
+ NeTEx_VR_Example.xml
+
+
+
+
+
+
+
+
+
+
+
+
+ Observed (actual) run and dwell times derived from SIRI RecordedCalls for VR:DatedServiceJourney:1_2026-01-04
+
+
+
+
+
+ PT6M30S
+
+
+
+ PT7M30S
+
+
+
+ PT35M
+
+
+
+ PT28M
+
+
+
+ PT44M
+
+
+
+ PT15M
+
+
+
+ PT12M
+
+
+
+ PT26M
+
+
+
+ PT13M
+
+
+
+ PT22M
+
+
+
+ PT18M
+
+
+
+ PT39M10S
+
+
+
+
+
+
+
+ PT1M30S
+
+
+
+ PT2M
+
+
+
+ PT2M
+
+
+
+ PT4M
+
+
+
+ PT2M
+
+
+
+ PT1M
+
+
+
+ PT3M
+
+
+
+ PT1M
+
+
+
+ PT2M
+
+
+
+ PT1M
+
+
+
+ PT1M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 06:56:30
+
+
+
+
+
+
+ 07:03:00
+ false
+
+
+ 07:04:30
+
+
+
+
+
+ 07:12:00
+ 07:14:00
+
+
+
+
+ 07:49:00
+ 07:51:00
+
+
+
+
+ 08:19:00
+ 08:23:00
+
+
+
+
+ 09:07:00
+ 09:09:00
+
+
+
+
+ 09:24:00
+ 09:25:00
+
+
+
+
+ 09:37:00
+ 09:40:00
+
+
+
+
+ 10:06:00
+ 10:07:00
+
+
+
+
+ 10:20:00
+ 10:22:00
+
+
+
+
+ 10:44:00
+ 10:45:00
+
+
+
+
+ 11:03:00
+ 11:04:00
+
+
+
+
+ 11:43:10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/Holistic_Example_NeTEx_SIRI_OpRa/SIRI_VR_Example.xml b/examples/Holistic_Example_NeTEx_SIRI_OpRa/SIRI_VR_Example.xml
new file mode 100644
index 0000000..aaf828c
--- /dev/null
+++ b/examples/Holistic_Example_NeTEx_SIRI_OpRa/SIRI_VR_Example.xml
@@ -0,0 +1,120 @@
+
+
+
+ 2026-01-04T11:45:00
+ VR
+ VR-Observed-2026-01-04
+
+ 2026-01-04T11:45:00
+
+ 2026-01-04T11:45:00
+
+ VR:Line:InterCity
+ VR:ScheduledStopPoint:001000460
+
+ 2026-01-04
+ VR:DatedServiceJourney:1_2026-01-04
+
+ rail
+ JOENSUU
+ VR
+
+
+ VR:ScheduledStopPoint:001002326
+ 2026-01-04T06:57:00
+ 2026-01-04T06:56:30
+
+
+ VR:ScheduledStopPoint:001000010
+ 2026-01-04T07:02:00
+ 2026-01-04T07:03:00
+ 2026-01-04T07:03:00
+ 2026-01-04T07:04:30
+
+
+ VR:ScheduledStopPoint:001000018
+ 2026-01-04T07:12:00
+ 2026-01-04T07:12:00
+ 2026-01-04T07:14:00
+ 2026-01-04T07:14:00
+
+
+ VR:ScheduledStopPoint:001000100
+ 2026-01-04T07:49:00
+ 2026-01-04T07:49:00
+ 2026-01-04T07:51:00
+ 2026-01-04T07:51:00
+
+
+ VR:ScheduledStopPoint:001000480
+ 2026-01-04T08:19:00
+ 2026-01-04T08:19:00
+ 2026-01-04T08:23:00
+ 2026-01-04T08:23:00
+
+
+ VR:ScheduledStopPoint:001000495
+ 2026-01-04T09:07:00
+ 2026-01-04T09:07:00
+ 2026-01-04T09:09:00
+ 2026-01-04T09:09:00
+
+
+ VR:ScheduledStopPoint:001000499
+ 2026-01-04T09:24:00
+ 2026-01-04T09:24:00
+ 2026-01-04T09:25:00
+ 2026-01-04T09:25:00
+
+
+ VR:ScheduledStopPoint:001000603
+ 2026-01-04T09:37:00
+ 2026-01-04T09:37:00
+ 2026-01-04T09:40:00
+ 2026-01-04T09:40:00
+
+
+ VR:ScheduledStopPoint:001000507
+ 2026-01-04T10:06:00
+ 2026-01-04T10:06:00
+ 2026-01-04T10:07:00
+ 2026-01-04T10:07:00
+
+
+ VR:ScheduledStopPoint:001000510
+ 2026-01-04T10:20:00
+ 2026-01-04T10:20:00
+ 2026-01-04T10:22:00
+ 2026-01-04T10:22:00
+
+
+ VR:ScheduledStopPoint:001000966
+ 2026-01-04T10:44:00
+ 2026-01-04T10:44:00
+ 2026-01-04T10:45:00
+ 2026-01-04T10:45:00
+
+
+ VR:ScheduledStopPoint:001000453
+ 2026-01-04T11:03:00
+ 2026-01-04T11:03:00
+ 2026-01-04T11:04:00
+ 2026-01-04T11:04:00
+
+
+ VR:ScheduledStopPoint:001000460
+ 2026-01-04T11:43:10
+ 2026-01-04T11:43:10
+
+
+ true
+
+
+
+
+