From 3c33e78f47fc3ccf35461ca7eb9bc952d477018d Mon Sep 17 00:00:00 2001
From: hfjelstad <hakon.fjelstad@entur.org>
Date: Tue, 10 Mar 2026 22:04:36 +0100
Subject: [PATCH 1/2] Adding Examples for discussion

---
 OJP                                           |   2 +-
 .../NeTEx_VR_Example.xml                      | 607 ++++++++++++++++++
 .../OpRa_VR_Example.xml                       | 406 ++++++++++++
 .../OpRa_VR_Example_Clean.xml                 | 251 ++++++++
 .../SIRI_VR_Example.xml                       | 120 ++++
 5 files changed, 1385 insertions(+), 1 deletion(-)
 create mode 100644 examples/Holistic_Example_NeTEx_SIRI_OpRa/NeTEx_VR_Example.xml
 create mode 100644 examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example.xml
 create mode 100644 examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example_Clean.xml
 create mode 100644 examples/Holistic_Example_NeTEx_SIRI_OpRa/SIRI_VR_Example.xml

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:siri="http://www.siri.org.uk/siri" version="1.0">
+    <PublicationTimestamp>2022-02-15T09:30:46.0Z</PublicationTimestamp>
+    <ParticipantRef>VR</ParticipantRef>
+    <dataObjects>
+        <CompositeFrame version="1" id="VR:CompositeFrame:SKDUPD_example_1_Classic_train">
+            <Name>Example of encoding Simple SKDUPD Classic Train example in NeTEx</Name>
+            <codespaces>
+                <Codespace id="vr">
+                    <Xmlns>vr</Xmlns>
+                    <XmlnsUrl>http://www.operator.fi/</XmlnsUrl>
+                    <Description>Operator's data</Description>
+                </Codespace>
+            </codespaces>
+            <!--- =======FRAME DEFAULTS======== -->
+            <FrameDefaults>
+                <DefaultLocale>
+                    <TimeZone>Europe/Helsinki</TimeZone>
+                    <DefaultLanguage>fi</DefaultLanguage>
+                </DefaultLocale>
+                <DefaultLocationSystem>4326</DefaultLocationSystem>
+            </FrameDefaults>
+            <frames>
+                <ResourceFrame version="1" id="VR:ResourceFrame:InterCity">
+                    <dataSources>
+                        <DataSource version="1" id="VR:DataSource:1">
+                            <keyList>
+                                <KeyValue>
+                                    <Key>RICS code</Key> <!-- Supplier -->
+                                    <Value>0010</Value>
+                                </KeyValue>
+                            </keyList>
+                            <Name>Valtionrautatiet</Name>
+                            <PrivateCode>0010</PrivateCode>
+                        </DataSource>
+                        <DataSource version="1" id="VR:DataSource:PlanningTool">
+                            <Description>Manually added informationg through planning tool</Description>
+                        </DataSource>
+                        <DataSource version="1" id="VR:DataSource:EmpiricalData">
+                            <Description>Empirical data provided via OpRa</Description>
+                        </DataSource>
+                    </dataSources>
+                </ResourceFrame>
+                <ServiceFrame version="1" id="VR:ServiceFrame:x">
+                    <lines>
+                        <Line version="1" id="VR:Line:InterCity">
+                            <Name>InterCity</Name>
+                            <TransportMode>rail</TransportMode>
+                            <PublicCode>InterCity</PublicCode>
+                            <AuthorityRef ref="VR:Authority:VR"/>
+                            <OperatorRef ref="VR:Operator:VR"/>
+                        </Line>
+                    </lines>
+                    <timingLinks>
+                        <TimingLink version="1" id="VR:TimingLink:1">
+                            <Distance>2800</Distance>
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001002326@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000010@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:2">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000010@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000018@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:3">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000018@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000100@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:4">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000100@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000480@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:5">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000480@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000495@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:6">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000495@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000499@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:7">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000499@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000603@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:8">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000603@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000507@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:9">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000507@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000510@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:10">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000510@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000966@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:11">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000966@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000453@X"/>
+                        </TimingLink>
+                        <TimingLink version="1" id="VR:TimingLink:12">
+                            <FromPointRef ref="VR:StopPointInJourneyPattern:1@001000453@X"/>
+                            <ToPointRef ref="VR:StopPointInJourneyPattern:1@001000460@X"/>
+                        </TimingLink>
+                    </timingLinks>
+                    <journeyPatterns>
+                        <JourneyPattern version="1" id="VR:JourneyPattern:X">
+                            <runTimes>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:1">
+                                    <TimingLinkRef ref="VR:TimingLink:1"/>
+                                    <RunTime>PT4M</RunTime> <!-- Calculated time between the locations in the TimingLink -->
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:2">
+                                    <TimingLinkRef ref="VR:TimingLink:2"/>
+                                    <RunTime>PT9M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:3">
+                                    <TimingLinkRef ref="VR:TimingLink:3"/>
+                                    <RunTime>PT35M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:4">
+                                    <TimingLinkRef ref="VR:TimingLink:4"/>
+                                    <RunTime>PT28M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:5">
+                                    <TimingLinkRef ref="VR:TimingLink:5"/>
+                                    <RunTime>PT44M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:6">
+                                    <TimingLinkRef ref="VR:TimingLink:6"/>
+                                    <RunTime>PT15M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:7">
+                                    <TimingLinkRef ref="VR:TimingLink:7"/>
+                                    <RunTime>PT12M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:8">
+                                    <TimingLinkRef ref="VR:TimingLink:8"/>
+                                    <RunTime>PT26M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:9">
+                                    <TimingLinkRef ref="VR:TimingLink:9"/>
+                                    <RunTime>PT13M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:10">
+                                    <TimingLinkRef ref="VR:TimingLink:10"/>
+                                    <RunTime>PT22M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:11">
+                                    <TimingLinkRef ref="VR:TimingLink:11"/>
+                                    <RunTime>PT18M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:12">
+                                    <TimingLinkRef ref="VR:TimingLink:12"/>
+                                    <RunTime>PT37M</RunTime>
+                                </JourneyPatternRunTime>
+                            </runTimes>
+                            <pointsInSequence>
+                                <StopPointInJourneyPattern order="1" version="0" id="VR:StopPointInJourneyPattern:1@001002326@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001002326"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:1"/>
+                                    <ForAlighting>false</ForAlighting>
+                                    <DestinationDisplayRef ref="VR:DestinationDisplay:JOENSUU"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="2" version="0" id="VR:StopPointInJourneyPattern:1@001000010@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000010"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:2"/>
+                                    <ForAlighting>false</ForAlighting>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="3" version="0" id="VR:StopPointInJourneyPattern:1@001000018@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000018"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:3"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="4" version="0" id="VR:StopPointInJourneyPattern:1@001000100@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000100"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:4"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="5" version="0" id="VR:StopPointInJourneyPattern:1@001000480@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000480"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:5"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="6" version="0" id="VR:StopPointInJourneyPattern:1@001000495@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000495"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:6"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="7" version="0" id="VR:StopPointInJourneyPattern:1@001000499@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000499"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:7"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="8" version="0" id="VR:StopPointInJourneyPattern:1@001000603@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000603"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:8"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="9" version="0" id="VR:StopPointInJourneyPattern:1@001000507@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000507"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:9"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="10" version="0" id="VR:StopPointInJourneyPattern:1@001000510@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000510"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:10"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="11" version="0" id="VR:StopPointInJourneyPattern:1@001000966@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000966"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:11"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="12" version="0" id="VR:StopPointInJourneyPattern:1@001000453@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000453"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:12"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="13" version="0" id="VR:StopPointInJourneyPattern:1@001000460@X">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000460"/>
+                                    <ForBoarding>false</ForBoarding>
+                                </StopPointInJourneyPattern>
+                            </pointsInSequence>
+                        </JourneyPattern>
+                        <JourneyPattern version="1" id="VR:JourneyPattern:Sunday">
+                            <runTimes>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:1_Sun">
+                                    <TimingLinkRef ref="VR:TimingLink:1"/>
+                                    <RunTime>PT4M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:2_Sun">
+                                    <TimingLinkRef ref="VR:TimingLink:2"/>
+                                    <RunTime>PT9M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:3_Sun">
+                                    <TimingLinkRef ref="VR:TimingLink:3"/>
+                                    <RunTime>PT35M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:4_Sun">
+                                    <TimingLinkRef ref="VR:TimingLink:4"/>
+                                    <RunTime>PT28M</RunTime>
+                                </JourneyPatternRunTime>
+                                <JourneyPatternRunTime version="1" id="VR:JourneyPatternRunTime:5_Sun">
+                                    <TimingLinkRef ref="VR:TimingLink:5"/>
+                                    <RunTime>PT44M</RunTime>
+                                </JourneyPatternRunTime>
+                            </runTimes>
+                            <pointsInSequence>
+                                <StopPointInJourneyPattern order="1" version="0" id="VR:StopPointInJourneyPattern:1@001002326@Sun">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001002326"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:1"/>
+                                    <ForAlighting>false</ForAlighting>
+                                    <DestinationDisplayRef ref="VR:DestinationDisplay:JOENSUU"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="2" version="0" id="VR:StopPointInJourneyPattern:1@001000010@Sun">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000010"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:2"/>
+                                    <ForAlighting>false</ForAlighting>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="3" version="0" id="VR:StopPointInJourneyPattern:1@001000018@Sun">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000018"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:3"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="4" version="0" id="VR:StopPointInJourneyPattern:1@001000100@Sun">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000100"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:4"/>
+                                </StopPointInJourneyPattern>
+                                <StopPointInJourneyPattern order="5" version="0" id="VR:StopPointInJourneyPattern:1@001000480@Sun">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000480"/>
+                                    <OnwardTimingLinkRef ref="VR:TimingLink:5"/>
+                                </StopPointInJourneyPattern>
+                            </pointsInSequence>
+                        </JourneyPattern>
+                    </journeyPatterns>
+                    <timeDemandTypes>
+                        <TimeDemandType version="1" id="VR:TimeDemandType:Human" dataSourceRef="VR:DataSource:PlanningTool">
+                            <Description>Manually added correction to the calculated time between stops</Description>
+                            <runTimes>
+                                <JourneyRunTime version="1" id="VR:JourneyRunTime:1">
+                                    <RunTime>PT1M</RunTime>
+                                </JourneyRunTime>
+                            </runTimes>
+                        </TimeDemandType>
+                        <TimeDemandType version="1" id="VR:TimeDemandType:QWRqdXN0bWVudFVzaW5nRW1waXJjYWxEYXRh" dataSourceRef="VR:DataSource:EmpiricalData">
+                            <Description>Manually added correction to the calculated time between stops</Description>
+                            <runTimes>
+                                <JourneyRunTime version="1" id="VR:JourneyRunTime:QWRqdXN0bWVudFVzaW5nRW1waXJjYWxEYXRh">
+                                    <RunTime>PT2M10S</RunTime>
+                                </JourneyRunTime>
+                            </runTimes>
+                        </TimeDemandType>
+                        <TimeDemandType version="1" id="VR:TimeDemandType:WaitTime_1M" dataSourceRef="VR:DataSource:PlanningTool">
+                            <Description>Planned waiting time of 1 minute</Description>
+                            <waitTimes>
+                                <JourneyWaitTime version="1" id="VR:JourneyWaitTime:1">
+                                    <WaitTime>PT1M</WaitTime>
+                                </JourneyWaitTime>
+                            </waitTimes>
+                        </TimeDemandType>
+                        <TimeDemandType version="1" id="VR:TimeDemandType:WaitTime_2M" dataSourceRef="VR:DataSource:PlanningTool">
+                            <Description>Planned waiting time of 2 minute</Description>
+                            <waitTimes>
+                                <JourneyWaitTime version="1" id="VR:JourneyWaitTime:2">
+                                    <WaitTime>PT2M</WaitTime>
+                                </JourneyWaitTime>
+                            </waitTimes>
+                        </TimeDemandType>
+                        <TimeDemandType version="1" id="VR:TimeDemandType:WaitTime_3M" dataSourceRef="VR:DataSource:PlanningTool">
+                            <Description>Planned waiting time of 3 minute</Description>
+                            <waitTimes>
+                                <JourneyWaitTime version="1" id="VR:JourneyWaitTime:3">
+                                    <WaitTime>PT3M</WaitTime>
+                                </JourneyWaitTime>
+                            </waitTimes>
+                        </TimeDemandType>
+                        <TimeDemandType version="1" id="VR:TimeDemandType:WaitTime_4M" dataSourceRef="VR:DataSource:PlanningTool">
+                            <Description>Planned waiting time of 4 minute</Description>
+                            <waitTimes>
+                                <JourneyWaitTime version="1" id="VR:JourneyWaitTime:4">
+                                    <WaitTime>PT4M</WaitTime>
+                                </JourneyWaitTime>
+                            </waitTimes>
+                        </TimeDemandType>
+                    </timeDemandTypes>
+                </ServiceFrame>
+                <TimetableFrame version="1" id="VR:TimetableFrame:SKDUPD_example_1_Classic_train">
+                    <Name>Uic Example of a very simple train timetable</Name>
+                    <VehicleModes>rail</VehicleModes>
+                    <vehicleJourneys>
+                        <ServiceJourney version="1" id="VR:ServiceJourney:1_Sun">
+                            <Name>Classic Train</Name>
+                            <PrivateCode>1</PrivateCode> <!-- Used instead of "production" TrainNumber -->
+                            <TransportMode>rail</TransportMode>
+                            <TransportSubmode>
+                                <RailSubmode>longDistance</RailSubmode>
+                            </TransportSubmode>
+                            <TypeOfServiceRef ref="VR:TypeOfService:HighSpeed"/>
+                            <DepartureTime>06:57:00</DepartureTime>
+                            <JourneyPatternRef ref="VR:JourneyPattern:Sunday"/>
+                            <PublicCode>1</PublicCode>
+                            <OperatorRef ref="VR:Operator:VR"/>
+                            <LineRef ref="VR:Line:InterCity"/>
+                            <calls>
+                                <Call version="1" id="VR:Call:1_SUN-1" order="1">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001002326"/>
+                                    <Departure>
+                                        <Time>06:57:00</Time>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1_SUN-2" order="2">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000010"/>
+                                    <Arrival>
+                                        <Time>07:02:00</Time>
+                                        <ForAlighting>false</ForAlighting>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:Human"/>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>07:03:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1_SUN-3" order="3">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000018"/>
+                                    <Arrival>
+                                        <Time>07:12:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>07:14:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_2M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1_SUN-4" order="4">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000100"/>
+                                    <Arrival>
+                                        <Time>07:49:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>07:51:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_2M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1_SUN-5" order="5">            
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000480"/>
+                                    <Arrival>
+                                        <Time>08:19:00</Time>
+                                    </Arrival>
+                                </Call>
+                            </calls>
+                        </ServiceJourney>
+                        <ServiceJourney version="1" id="VR:ServiceJourney:1" changed="2026-01-20T09:51:00">
+                            <Name>Classic Train</Name>
+                            <PrivateCode>1</PrivateCode> <!-- Used instead of "production" TrainNumber -->
+                            <TransportMode>rail</TransportMode>
+                            <TransportSubmode>
+                                <RailSubmode>longDistance</RailSubmode>
+                            </TransportSubmode>
+                            <TypeOfServiceRef ref="VR:TypeOfService:HighSpeed"/>
+                            <DepartureTime>06:57:00</DepartureTime>
+                            <JourneyPatternRef ref="VR:JourneyPattern:X"/>
+                            <PublicCode>1</PublicCode> <!-- Used instead of "advertised" TrainNumber -->
+                            <OperatorRef ref="VR:Operator:VR"/>
+                            <LineRef ref="VR:Line:InterCity"/>
+                            <parts>
+                                <JourneyPart version="1" id="1@001002326+001000460" order="1">
+                                    <MainPartRef version="1" ref="1@001002326+001000460"/>
+                                    <FromStopPointRef ref="VR:ScheduledStopPoint:001002326"/>
+                                    <ToStopPointRef ref="VR:ScheduledStopPoint:001000460"/>
+                                    <StartTime>06:57:00</StartTime> <!-- Redundant -->
+                                    <EndTime>11:43:10</EndTime>     <!-- Redundant -->
+                                    <facilities>
+                                        <ServiceFacilitySetRef ref="1@63"/>
+                                        <ServiceFacilitySetRef ref="1@S11"/>
+                                        <ServiceFacilitySetRef ref="1@S27"/>
+                                        <ServiceFacilitySetRef ref="1@F4"/>
+                                        <ServiceFacilitySetRef ref="1@F48"/>
+                                        <ServiceFacilitySetRef ref="1@F5"/>
+                                        <ServiceFacilitySetRef ref="1@F9"/>
+                                        <ServiceFacilitySetRef ref="1@R13"/>
+                                    </facilities>
+                                </JourneyPart>
+                            </parts>
+                            <calls>
+                                <Call version="1" id="VR:Call:1-1" order="1">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001002326"/>
+                                    <Departure>
+                                        <Time>06:57:00</Time>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-2" order="2">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000010"/>
+                                    <Arrival>
+                                        <Time>07:02:00</Time>
+                                        <ForAlighting>false</ForAlighting>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:Human"/>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>07:03:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-3" order="3">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000018"/>
+                                    <Arrival>
+                                        <Time>07:12:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>07:14:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_2M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-4" order="4">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000100"/>
+                                    <Arrival>
+                                        <Time>07:49:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>07:51:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_2M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-5" order="5">            
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000480"/>
+                                    <Arrival>
+                                        <Time>08:19:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>08:23:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_4M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-6" order="6">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000495"/>
+                                    <Arrival>
+                                        <Time>09:07:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>09:09:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_2M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-7" order="7">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000499"/>
+                                    <Arrival>
+                                        <Time>09:24:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>09:25:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-8" order="8">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000603"/>
+                                    <Arrival>
+                                        <Time>09:37:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>09:40:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_3M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-9" order="9">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000507"/>
+                                    <Arrival>
+                                        <Time>10:06:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>10:07:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-10" order="10">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000510"/>
+                                    <Arrival>
+                                        <Time>10:20:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>10:22:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_2M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-11" order="11">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000966"/>
+                                    <Arrival>
+                                        <Time>10:44:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>10:45:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-12" order="12">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000453"/>
+                                    <Arrival>
+                                        <Time>11:03:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>11:04:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-13" order="13">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000460"/>
+                                    <Arrival>
+                                        <Time>11:43:10</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:QWRqdXN0bWVudFVzaW5nRW1waXJjYWxEYXRh"/>
+                                    </Arrival>
+                                </Call>
+                            </calls>
+                            <facilities>
+                                <ServiceFacilitySetRef ref="1@reservation"/>
+                            </facilities>
+                        </ServiceJourney>
+                        <DatedServiceJourney version="1" id="VR:DatedServiceJourney:1_2026-01-04">
+                            <ServiceJourneyRef ref="VR:ServiceJourney:1_Sun"/>
+                            <OperatingDayRef ref="VR:OperatingDay:2026-01-04"/>
+                        </DatedServiceJourney>
+                        <DatedServiceJourney version="1" id="VR:DatedServiceJourney:1_2026-01-05">
+                            <Description>Date specific override that does not have the empirical timing</Description>
+                            <calls>
+                                <Call version="1" id="VR:Call:1-12_1_2026-01-25" derivedFromObjectRef="VR:Call:1-12">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000453"/>
+                                    <Arrival>
+                                        <Time>11:03:00</Time>
+                                    </Arrival>
+                                    <Departure>
+                                        <Time>11:04:00</Time>
+                                        <TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                    </Departure>
+                                </Call>
+                                <Call version="1" id="VR:Call:1-13_1_2026-01-25" derivedFromObjectRef="VR:Call:1-13">
+                                    <ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000460"/>
+                                    <Arrival>
+                                        <Time>11:41:00</Time>
+                                    </Arrival>
+                                </Call>
+                            </calls>
+                            <ServiceJourneyRef ref="VR:ServiceJourney:1"/>
+                            <OperatingDayRef ref="VR:OperatingDay:2026-01-05"/>
+                        </DatedServiceJourney>
+                        <DatedServiceJourney version="1" id="VR:DatedServiceJourney:1_2026-01-06">
+                            <ServiceJourneyRef ref="VR:ServiceJourney:1"/>
+                            <OperatingDayRef ref="VR:OperatingDay:2026-01-06"/>
+                        </DatedServiceJourney>
+                        <DatedServiceJourney version="1" id="VR:DatedServiceJourney:1_2026-01-07">
+                            <ServiceJourneyRef ref="VR:ServiceJourney:1"/>
+                            <OperatingDayRef ref="VR:OperatingDay:2026-01-07"/>
+                        </DatedServiceJourney>
+                        <DatedServiceJourney version="1" id="VR:DatedServiceJourney:1_2026-01-08">
+                            <ServiceJourneyRef ref="VR:ServiceJourney:1"/>
+                            <OperatingDayRef ref="VR:OperatingDay:2026-01-08"/>
+                        </DatedServiceJourney>
+                        <DatedServiceJourney version="1" id="VR:DatedServiceJourney:1_2026-01-09">
+                            <ServiceJourneyRef ref="VR:ServiceJourney:1"/>
+                            <OperatingDayRef ref="VR:OperatingDay:2026-01-09"/>
+                        </DatedServiceJourney>
+                        <DatedServiceJourney version="1" id="VR:DatedServiceJourney:1_2026-01-10">
+                            <ServiceJourneyRef ref="VR:ServiceJourney:1"/>
+                            <OperatingDayRef ref="VR:OperatingDay:2026-01-10"/>
+                        </DatedServiceJourney>
+                        <DatedServiceJourney version="1" id="VR:DatedServiceJourney:1_2026-01-11">
+                            <ServiceJourneyRef ref="VR:ServiceJourney:1_Sun"/>
+                            <OperatingDayRef ref="VR:OperatingDay:2026-01-11"/>
+                        </DatedServiceJourney>
+                        <DatedServiceJourney version="1" id="VR:DatedServiceJourney:1_2026-01-18">
+                            <ServiceJourneyRef ref="VR:ServiceJourney:1_Sun"/>
+                            <OperatingDayRef ref="VR:OperatingDay:2026-01-18"/>
+                        </DatedServiceJourney>
+                        <DatedServiceJourney version="1" id="VR:DatedServiceJourney:1_2026-01-25">
+                            <ServiceJourneyRef ref="VR:ServiceJourney:1_Sun"/>
+                            <OperatingDayRef ref="VR:OperatingDay:2026-01-25"/>
+                        </DatedServiceJourney>
+                    </vehicleJourneys>
+                </TimetableFrame>
+            </frames>
+        </CompositeFrame>
+    </dataObjects>
+</PublicationDelivery>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Opra xmlns="https://transmodel-cen.eu/opra/1.0" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://transmodel-cen.eu/opra/1.0 ../xsd/opra.xsd">
+    <ServiceDelivery>
+        <siri:ResponseTimestamp>2026-03-09T13:37:00Z</siri:ResponseTimestamp>
+        <opraFunctionalDeliveries>
+            <PublicationDelivery version="1.0">
+                <siri:ResponseTimestamp>2026-03-09T13:37:00Z</siri:ResponseTimestamp>
+                <ActualServiceRequest>
+                    <siri:RequestTimestamp>2026-03-09T13:37:00Z</siri:RequestTimestamp>
+                    <siri:MessageIdentifier>2026-03-10T12:23:45.460852548+01:00</siri:MessageIdentifier> <!-- Is this a reference to the SIRI source --> 
+                </ActualServiceRequest>
+                <dataObjects>
+                    <PlannedServiceFrame>
+                        <NetexUrl>VR_InterCity.xml</NetexUrl>
+                    </PlannedServiceFrame>
+                    <ActualServiceFrame>
+                        <NetexPayload>
+                            <netex:CompositeFrame id="ENT:CompositeFrame:1">
+                                <netex:frames>
+                                    <netex:ServiceFrame id="ENT:ServiceFrame:1-001002326">                                        
+                                        <netex:timeDemandTypes>
+                                            <netex:TimeDemandType id="ENT:TimeDemandType:Realtime-1">                                    
+                                                <netex:runTimes>       
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:1">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:1"/>
+                                                        <netex:RunTime>PT6M30S</netex:RunTime>
+                                                    </netex:JourneyRunTime>                                                  
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:2">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:2"/>
+                                                        <netex:RunTime>PT7M30S</netex:RunTime>
+                                                    </netex:JourneyRunTime>                                            
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:3">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:3"/>
+                                                        <netex:RunTime>PT35M</netex:RunTime>
+                                                    </netex:JourneyRunTime>                                                   
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:4">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:4"/>
+                                                        <netex:RunTime>PT28M</netex:RunTime>
+                                                    </netex:JourneyRunTime>                                            
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:5">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:5"/>
+                                                        <netex:RunTime>PT44M</netex:RunTime>
+                                                    </netex:JourneyRunTime>        
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:6">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:6"/>
+                                                        <netex:RunTime>PT15M</netex:RunTime>
+                                                    </netex:JourneyRunTime>                                                   
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:7">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:7"/>
+                                                        <netex:RunTime>PT12M</netex:RunTime>
+                                                    </netex:JourneyRunTime>                                                
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:8">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:8"/>
+                                                        <netex:RunTime>PT26M</netex:RunTime>
+                                                    </netex:JourneyRunTime>                                                   
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:9">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:9"/>
+                                                        <netex:RunTime>PT13M</netex:RunTime>
+                                                    </netex:JourneyRunTime>                                                  
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:10">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:10"/>
+                                                        <netex:RunTime>PT22M</netex:RunTime>
+                                                    </netex:JourneyRunTime>                                                   
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:11">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:11"/>
+                                                        <netex:RunTime>PT18M</netex:RunTime>
+                                                    </netex:JourneyRunTime>                                              
+                                                    <netex:JourneyRunTime version="1" id="ENT:JourneyPatternRunTime:12">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:12"/>
+                                                        <netex:RunTime>PT39M10S</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                </netex:runTimes>                                              
+                                                <netex:waitTimes>                                                   
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:2">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000010"/>
+                                                        <netex:WaitTime>PT1M30S</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                   
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:3">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000018"/>
+                                                        <netex:WaitTime>PT2M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                    
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:4">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000100"/>
+                                                        <netex:WaitTime>PT2M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                   
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:5">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000480"/>
+                                                        <netex:WaitTime>PT4M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                   
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:6">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000495"/>
+                                                        <netex:WaitTime>PT2M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                    
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:7">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000499"/>
+                                                        <netex:WaitTime>PT1M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                   
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:8">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000603"/>
+                                                        <netex:WaitTime>PT3M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                   
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:9">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000507"/>
+                                                        <netex:WaitTime>PT1M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                    
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:10">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000510"/>
+                                                        <netex:WaitTime>PT2M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                    
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:11">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000966"/>
+                                                        <netex:WaitTime>PT1M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                    
+                                                    <netex:JourneyWaitTime id="ENT:WaitTime:12">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000453"/>
+                                                        <netex:WaitTime>PT1M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>                                                   
+                                                </netex:waitTimes>
+                                            </netex:TimeDemandType>
+                                            <netex:TimeDemandType id="ENT:TimeDemandType:1-001002326-001000010">
+                                                <netex:runTimes>
+                                                    <netex:JourneyRunTime id="ENT:JourneyRunTime:1-001002326-001000010">
+                                                        <netex:RunTime>PT1M</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                </netex:runTimes>
+                                            </netex:TimeDemandType>
+                                            <netex:TimeDemandType id="ENT:TimeDemandType:1-001000010">
+                                                <netex:waitTimes>
+                                                    <netex:JourneyWaitTime id="ENT:JourneyWaitTime:1-001000010">
+                                                        <netex:WaitTime>PT1M30S</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                </netex:waitTimes>
+                                            </netex:TimeDemandType>
+                                        </netex:timeDemandTypes>
+                                    </netex:ServiceFrame>
+                                    <!-- SHOWING ACTUAL TIME IN TIMETABLE --> 
+                                    <netex:TimetableFrame version="1" id="ENT:TimetableFrame:1">
+                                        <netex:vehicleJourneys>
+                                            <!--  -->
+                                            <netex:DatedServiceJourney version="1" id="ENT:DatedVehicleJourney:Example-TimeDemandType" derivedFromObjectRef="VR:DatedServiceJourney:1_2026-01-04">
+                                                <netex:TimeDemandTypeRef ref="ENT:TimeDemandType:Realtime-1"/>
+                                            </netex:DatedServiceJourney>
+                                            <!-- USING runTimes  -->
+                                            <netex:DatedServiceJourney version="1" id="ENT:DatedVehicleJourney:Example-runTimes" derivedFromObjectRef="VR:DatedServiceJourney:1_2026-01-04">
+                                                <netex:runTimes>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:1">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:1"/>
+                                                        <netex:RunTime>PT4M</netex:RunTime> <!-- Calculated time between the locations in the TimingLink -->
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:2">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:2"/>
+                                                        <netex:RunTime>PT9M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:3">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:3"/>
+                                                        <netex:RunTime>PT35M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:4">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:4"/>
+                                                        <netex:RunTime>PT28M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:5">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:5"/>
+                                                        <netex:RunTime>PT44M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:6">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:6"/>
+                                                        <netex:RunTime>PT15M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:7">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:7"/>
+                                                        <netex:RunTime>PT12M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:8">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:8"/>
+                                                        <netex:RunTime>PT26M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:9">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:9"/>
+                                                        <netex:RunTime>PT13M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:10">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:10"/>
+                                                        <netex:RunTime>PT22M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:11">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:11"/>
+                                                        <netex:RunTime>PT18M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                    <netex:VehicleJourneyRunTime version="1" id="ENT:JourneyPatternRunTime:12">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:12"/>
+                                                        <netex:RunTime>PT37M</netex:RunTime>
+                                                    </netex:VehicleJourneyRunTime>
+                                                </netex:runTimes>
+                                            </netex:DatedServiceJourney>
+                                            <!-- DETAILED JOURNEY USING CALLS -->
+                                            <netex:DatedVehicleJourney version="1" id="ENT:DatedVehicleJourney:Example" derivedFromObjectRef="VR:DatedServiceJourney:1_2026-01-04">
+                                                <netex:OperatingDayRef ref="2026-01-04"/> <!-- Should be REDUNDANT at this point? -->
+                                                <netex:datedCalls>
+                                                    <netex:Call version="1" id="ENT:Call:1-1" order="1" derivedFromObjectRef="VR:Call:1-1">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001002326"/>
+                                                        <netex:Departure>
+                                                            <netex:Time>06:56:30</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="ENT:TimeDemandType:1-001002326"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-2" order="2" derivedFromObjectRef="VR:Call:1-2">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000010"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>07:03:00</netex:Time>
+                                                            <netex:ForAlighting>false</netex:ForAlighting>
+                                                            <netex:TimeDemandTypeRef ref="ENT:TimeDemandType:1-001002326-001000010"/>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>07:04:33</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref=""/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-3" order="3" derivedFromObjectRef="VR:Call:1-3">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000018"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>07:12:00</netex:Time>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>07:14:00</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_2M"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-4" order="4" derivedFromObjectRef="VR:Call:1-4">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000100"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>07:49:00</netex:Time>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>07:51:00</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_2M"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-5" order="5" derivedFromObjectRef="VR:Call:1-5">            
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000480"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>08:19:00</netex:Time>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>08:23:00</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_4M"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-6" order="6" derivedFromObjectRef="VR:Call:1-6">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000495"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>09:07:00</netex:Time>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>09:09:00</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_2M"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-7" order="7" derivedFromObjectRef="VR:Call:1-7">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000499"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>09:24:00</netex:Time>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>09:25:00</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-8" order="8" derivedFromObjectRef="VR:Call:1-8">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000603"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>09:37:00</netex:Time>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>09:40:00</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_3M"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-9" order="9" derivedFromObjectRef="VR:Call:1-9">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000507"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>10:06:00</netex:Time>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>10:07:00</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-10" order="10" derivedFromObjectRef="VR:Call:1-10">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000510"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>10:20:00</netex:Time>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>10:22:00</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_2M"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-11" order="11" derivedFromObjectRef="VR:Call:1-11">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000966"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>10:44:00</netex:Time>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>10:45:00</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-12" order="12" derivedFromObjectRef="VR:Call:1-12">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000453"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>11:03:00</netex:Time>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>11:04:00</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:WaitTime_1M"/>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    <netex:Call version="1" id="ENT:Call:1-13" order="13" derivedFromObjectRef="VR:Call:1-13">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000460"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>11:43:10</netex:Time>
+                                                            <netex:TimeDemandTypeRef ref="VR:TimeDemandType:QWRqdXN0bWVudFVzaW5nRW1waXJjYWxEYXRh"/>
+                                                        </netex:Arrival>
+                                                    </netex:Call>
+                                                </netex:datedCalls>
+                                            </netex:DatedVehicleJourney>
+                                            <!-- USING PASSINGTIMES  -->
+                                            <netex:DatedServiceJourney version="1" id="ENT:DatedVehicleJourney:Example" derivedFromObjectRef="VR:DatedServiceJourney:1_2026-01-04">
+                                                <netex:passingTimes>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-1">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001002326@X"/>
+                                                        <netex:DepartureTime>06:57:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-2">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000010@X"/>
+                                                        <netex:ArrivalTime>07:02:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>07:03:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-3">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000018@X"/>
+                                                        <netex:ArrivalTime>07:12:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>07:14:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-4">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000100@X"/>
+                                                        <netex:ArrivalTime>07:49:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>07:51:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-5">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000480@X"/>
+                                                        <netex:ArrivalTime>08:19:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>08:23:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-6">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000495@X"/>
+                                                        <netex:ArrivalTime>09:07:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>09:09:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-7">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000499@X"/>
+                                                        <netex:ArrivalTime>09:24:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>09:25:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-8">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000603@X"/>
+                                                        <netex:ArrivalTime>09:37:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>09:40:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-9">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000507@X"/>
+                                                        <netex:ArrivalTime>10:06:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>10:07:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-10">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000510@X"/>
+                                                        <netex:ArrivalTime>10:20:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>10:22:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-11">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000966@X"/>
+                                                        <netex:ArrivalTime>10:44:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>10:45:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-12">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000453@X"/>
+                                                        <netex:ArrivalTime>11:03:00</netex:ArrivalTime>
+                                                        <netex:DepartureTime>11:04:00</netex:DepartureTime>
+                                                    </netex:TimetabledPassingTime>
+                                                    <netex:TimetabledPassingTime version="1" id="VR:TimetabledPassingTime:1-13">
+                                                        <netex:StopPointInJourneyPatternRef ref="VR:StopPointInJourneyPattern:1@001000460@X"/>
+                                                        <netex:ArrivalTime>11:43:00</netex:ArrivalTime>
+                                                    </netex:TimetabledPassingTime>
+                                                </netex:passingTimes>
+                                            </netex:DatedServiceJourney>
+                                        </netex:vehicleJourneys>
+                                    </netex:TimetableFrame>
+                                </netex:frames>
+                            </netex:CompositeFrame>
+                        </NetexPayload>
+                    </ActualServiceFrame>
+                </dataObjects>
+            </PublicationDelivery>
+        </opraFunctionalDeliveries>
+    </ServiceDelivery>
+</Opra>
\ 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..b5c1d17
--- /dev/null
+++ b/examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example_Clean.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Opra xmlns="https://transmodel-cen.eu/opra/1.0"
+    xmlns:netex="http://www.netex.org.uk/netex"
+    xmlns:siri="http://www.siri.org.uk/siri"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://transmodel-cen.eu/opra/1.0 ../xsd/opra.xsd">
+    
+    <ServiceDelivery>
+        <siri:ResponseTimestamp>2026-03-09T13:37:00Z</siri:ResponseTimestamp>
+        
+        <opraFunctionalDeliveries>
+            <PublicationDelivery version="1.0">
+                <siri:ResponseTimestamp>2026-03-09T13:37:00Z</siri:ResponseTimestamp>
+                
+                <!-- Minimal request header, no duplication of planned data -->
+                <ActualServiceRequest>
+                    <siri:RequestTimestamp>2026-03-09T13:37:00Z</siri:RequestTimestamp>
+                    <siri:MessageIdentifier>VR-Observed-2026-01-04</siri:MessageIdentifier>
+                </ActualServiceRequest>
+                
+                <dataObjects>
+                    
+                    <!-- (A) REFERANSE TIL PLAN (URL/ID), men uten å gjenskape plan -->
+                    <PlannedServiceFrame>
+                        <NetexUrl>VR_InterCity.xml</NetexUrl>
+                    </PlannedServiceFrame>
+                    
+                    <!-- (B) OBSERVERT/EMPIRISK LAG (kun actual og avledede målinger) -->
+                    <ActualServiceFrame>
+                        <NetexPayload>
+                            <netex:CompositeFrame id="ENT:CompositeFrame:Observed-2026-01-04">
+                                <netex:frames>
+                                    
+                                    <!-- 1) OBSERVERTE RUN/WAIT-TIMES (enkelt og samlet) -->
+                                    <netex:ServiceFrame id="ENT:ServiceFrame:Observed:VR:DatedServiceJourney:1_2026-01-04">
+                                        <netex:timeDemandTypes>
+                                            <netex:TimeDemandType id="ENT:TimeDemandType:Observed-2026-01-04" dataSourceRef="VR:DataSource:EmpiricalData">
+                                                <netex:Description>Observed (actual) run and dwell times derived from SIRI RecordedCalls for VR:DatedServiceJourney:1_2026-01-04</netex:Description>
+                                                
+                                                <!-- Observed RUN-TIMES (ActualDeparture(i) -> ActualArrival(i+1)) -->
+                                                <netex:runTimes>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:1">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:1"/>
+                                                        <netex:RunTime>PT6M30S</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:2">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:2"/>
+                                                        <netex:RunTime>PT7M30S</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:3">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:3"/>
+                                                        <netex:RunTime>PT35M</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:4">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:4"/>
+                                                        <netex:RunTime>PT28M</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:5">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:5"/>
+                                                        <netex:RunTime>PT44M</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:6">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:6"/>
+                                                        <netex:RunTime>PT15M</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:7">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:7"/>
+                                                        <netex:RunTime>PT12M</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:8">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:8"/>
+                                                        <netex:RunTime>PT26M</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:9">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:9"/>
+                                                        <netex:RunTime>PT13M</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:10">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:10"/>
+                                                        <netex:RunTime>PT22M</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:11">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:11"/>
+                                                        <netex:RunTime>PT18M</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                    <netex:JourneyRunTime id="ENT:ObservedRun:12">
+                                                        <netex:TimingLinkRef ref="VR:TimingLink:12"/>
+                                                        <netex:RunTime>PT39M10S</netex:RunTime>
+                                                    </netex:JourneyRunTime>
+                                                </netex:runTimes>
+                                                
+                                                <!-- Observed WAIT-TIMES (ActualArrival -> ActualDeparture ved samme stopp) -->
+                                                <netex:waitTimes>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000010">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000010"/>
+                                                        <netex:WaitTime>PT1M30S</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000018">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000018"/>
+                                                        <netex:WaitTime>PT2M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000100">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000100"/>
+                                                        <netex:WaitTime>PT2M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000480">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000480"/>
+                                                        <netex:WaitTime>PT4M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000495">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000495"/>
+                                                        <netex:WaitTime>PT2M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000499">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000499"/>
+                                                        <netex:WaitTime>PT1M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000603">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000603"/>
+                                                        <netex:WaitTime>PT3M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000507">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000507"/>
+                                                        <netex:WaitTime>PT1M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000510">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000510"/>
+                                                        <netex:WaitTime>PT2M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000966">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000966"/>
+                                                        <netex:WaitTime>PT1M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                    <netex:JourneyWaitTime id="ENT:ObservedWait:001000453">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000453"/>
+                                                        <netex:WaitTime>PT1M</netex:WaitTime>
+                                                    </netex:JourneyWaitTime>
+                                                </netex:waitTimes>
+                                                
+                                            </netex:TimeDemandType>
+                                        </netex:timeDemandTypes>
+                                    </netex:ServiceFrame>
+                                    
+                                    <!-- 2) FAKTISK STOPPSEKVENS (datedCalls), kun actual tider -->
+                                    <netex:TimetableFrame id="ENT:TimetableFrame:Observed-2026-01-04" version="1">
+                                        <netex:vehicleJourneys>
+                                            <netex:DatedVehicleJourney id="ENT:DatedVehicleJourney:Observed:VR:DatedServiceJourney:1_2026-01-04"
+                                                version="1"
+                                                derivedFromObjectRef="VR:DatedServiceJourney:1_2026-01-04">
+                                                <netex:datedCalls>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:1" order="1" version="1" derivedFromObjectRef="VR:Call:1-1">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001002326"/>
+                                                        <netex:Departure>
+                                                            <netex:Time>06:56:30</netex:Time>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:2" order="2" version="1" derivedFromObjectRef="VR:Call:1-2">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000010"/>
+                                                        <netex:Arrival>
+                                                            <netex:Time>07:03:00</netex:Time>
+                                                            <netex:ForAlighting>false</netex:ForAlighting>
+                                                        </netex:Arrival>
+                                                        <netex:Departure>
+                                                            <netex:Time>07:04:30</netex:Time>
+                                                        </netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:3" order="3" version="1" derivedFromObjectRef="VR:Call:1-3">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000018"/>
+                                                        <netex:Arrival><netex:Time>07:12:00</netex:Time></netex:Arrival>
+                                                        <netex:Departure><netex:Time>07:14:00</netex:Time></netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:4" order="4" version="1" derivedFromObjectRef="VR:Call:1-4">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000100"/>
+                                                        <netex:Arrival><netex:Time>07:49:00</netex:Time></netex:Arrival>
+                                                        <netex:Departure><netex:Time>07:51:00</netex:Time></netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:5" order="5" version="1" derivedFromObjectRef="VR:Call:1-5">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000480"/>
+                                                        <netex:Arrival><netex:Time>08:19:00</netex:Time></netex:Arrival>
+                                                        <netex:Departure><netex:Time>08:23:00</netex:Time></netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:6" order="6" version="1" derivedFromObjectRef="VR:Call:1-6">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000495"/>
+                                                        <netex:Arrival><netex:Time>09:07:00</netex:Time></netex:Arrival>
+                                                        <netex:Departure><netex:Time>09:09:00</netex:Time></netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:7" order="7" version="1" derivedFromObjectRef="VR:Call:1-7">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000499"/>
+                                                        <netex:Arrival><netex:Time>09:24:00</netex:Time></netex:Arrival>
+                                                        <netex:Departure><netex:Time>09:25:00</netex:Time></netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:8" order="8" version="1" derivedFromObjectRef="VR:Call:1-8">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000603"/>
+                                                        <netex:Arrival><netex:Time>09:37:00</netex:Time></netex:Arrival>
+                                                        <netex:Departure><netex:Time>09:40:00</netex:Time></netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:9" order="9" version="1" derivedFromObjectRef="VR:Call:1-9">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000507"/>
+                                                        <netex:Arrival><netex:Time>10:06:00</netex:Time></netex:Arrival>
+                                                        <netex:Departure><netex:Time>10:07:00</netex:Time></netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:10" order="10" version="1" derivedFromObjectRef="VR:Call:1-10">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000510"/>
+                                                        <netex:Arrival><netex:Time>10:20:00</netex:Time></netex:Arrival>
+                                                        <netex:Departure><netex:Time>10:22:00</netex:Time></netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:11" order="11" version="1" derivedFromObjectRef="VR:Call:1-11">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000966"/>
+                                                        <netex:Arrival><netex:Time>10:44:00</netex:Time></netex:Arrival>
+                                                        <netex:Departure><netex:Time>10:45:00</netex:Time></netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:12" order="12" version="1" derivedFromObjectRef="VR:Call:1-12">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000453"/>
+                                                        <netex:Arrival><netex:Time>11:03:00</netex:Time></netex:Arrival>
+                                                        <netex:Departure><netex:Time>11:04:00</netex:Time></netex:Departure>
+                                                    </netex:Call>
+                                                    
+                                                    <netex:Call id="ENT:ObservedCall:13" order="13" version="1" derivedFromObjectRef="VR:Call:1-13">
+                                                        <netex:ScheduledStopPointRef ref="VR:ScheduledStopPoint:001000460"/>
+                                                        <netex:Arrival><netex:Time>11:43:10</netex:Time></netex:Arrival>
+                                                    </netex:Call>
+                                                    
+                                                </netex:datedCalls>
+                                            </netex:DatedVehicleJourney>
+                                        </netex:vehicleJourneys>
+                                    </netex:TimetableFrame>
+                                    
+                                </netex:frames>
+                            </netex:CompositeFrame>
+                        </NetexPayload>
+                    </ActualServiceFrame>
+                    
+                </dataObjects>
+            </PublicationDelivery>
+        </opraFunctionalDeliveries>
+    </ServiceDelivery>
+</Opra>
+
+
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Siri 
+    xmlns="http://www.siri.org.uk/siri" 
+    xmlns:acsb="http://www.ifopt.org.uk/acsb" 
+    xmlns:ifopt="http://www.ifopt.org.uk/ifopt" 
+    xmlns:datex2="http://datex2.eu/schema/2_0RC1/2_0"
+    version="2.0">
+    <ServiceDelivery>
+        <ResponseTimestamp>2026-01-04T11:45:00</ResponseTimestamp>
+        <ProducerRef>VR</ProducerRef>
+        <ResponseMessageIdentifier>VR-Observed-2026-01-04</ResponseMessageIdentifier>
+        <EstimatedTimetableDelivery version="2.0">
+            <ResponseTimestamp>2026-01-04T11:45:00</ResponseTimestamp>
+            <EstimatedJourneyVersionFrame>
+                <RecordedAtTime>2026-01-04T11:45:00</RecordedAtTime>
+                <EstimatedVehicleJourney>
+                    <LineRef>VR:Line:InterCity</LineRef>
+                    <DirectionRef>VR:ScheduledStopPoint:001000460</DirectionRef>
+                    <FramedVehicleJourneyRef>
+                        <DataFrameRef>2026-01-04</DataFrameRef>
+                        <DatedVehicleJourneyRef>VR:DatedServiceJourney:1_2026-01-04</DatedVehicleJourneyRef>
+                    </FramedVehicleJourneyRef>
+                    <VehicleMode>rail</VehicleMode>
+                    <OriginName>JOENSUU</OriginName>
+                    <OperatorRef>VR</OperatorRef>                   
+                    <RecordedCalls>
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001002326</StopPointRef>
+                            <AimedDepartureTime>2026-01-04T06:57:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T06:56:30</ActualDepartureTime>
+                        </RecordedCall>                    
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000010</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T07:02:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T07:03:00</ActualArrivalTime>
+                            <AimedDepartureTime>2026-01-04T07:03:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T07:04:30</ActualDepartureTime>
+                        </RecordedCall>                    
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000018</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T07:12:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T07:12:00</ActualArrivalTime>                         
+                            <AimedDepartureTime>2026-01-04T07:14:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T07:14:00</ActualDepartureTime>
+                        </RecordedCall>                      
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000100</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T07:49:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T07:49:00</ActualArrivalTime>                            
+                            <AimedDepartureTime>2026-01-04T07:51:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T07:51:00</ActualDepartureTime>
+                        </RecordedCall>                       
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000480</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T08:19:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T08:19:00</ActualArrivalTime>                           
+                            <AimedDepartureTime>2026-01-04T08:23:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T08:23:00</ActualDepartureTime>
+                        </RecordedCall>                      
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000495</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T09:07:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T09:07:00</ActualArrivalTime>                           
+                            <AimedDepartureTime>2026-01-04T09:09:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T09:09:00</ActualDepartureTime>
+                        </RecordedCall>                      
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000499</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T09:24:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T09:24:00</ActualArrivalTime>                          
+                            <AimedDepartureTime>2026-01-04T09:25:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T09:25:00</ActualDepartureTime>
+                        </RecordedCall>                       
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000603</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T09:37:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T09:37:00</ActualArrivalTime>                          
+                            <AimedDepartureTime>2026-01-04T09:40:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T09:40:00</ActualDepartureTime>
+                        </RecordedCall>                      
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000507</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T10:06:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T10:06:00</ActualArrivalTime>                           
+                            <AimedDepartureTime>2026-01-04T10:07:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T10:07:00</ActualDepartureTime>
+                        </RecordedCall>                        
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000510</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T10:20:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T10:20:00</ActualArrivalTime>                          
+                            <AimedDepartureTime>2026-01-04T10:22:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T10:22:00</ActualDepartureTime>
+                        </RecordedCall>                       
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000966</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T10:44:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T10:44:00</ActualArrivalTime>                          
+                            <AimedDepartureTime>2026-01-04T10:45:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T10:45:00</ActualDepartureTime>
+                        </RecordedCall>
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000453</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T11:03:00</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T11:03:00</ActualArrivalTime>                           
+                            <AimedDepartureTime>2026-01-04T11:04:00</AimedDepartureTime>
+                            <ActualDepartureTime>2026-01-04T11:04:00</ActualDepartureTime>
+                        </RecordedCall>                       
+                        <RecordedCall>
+                            <StopPointRef>VR:ScheduledStopPoint:001000460</StopPointRef>
+                            <AimedArrivalTime>2026-01-04T11:43:10</AimedArrivalTime>
+                            <ActualArrivalTime>2026-01-04T11:43:10</ActualArrivalTime>
+                        </RecordedCall>
+                    </RecordedCalls>                
+                    <IsCompleteStopSequence>true</IsCompleteStopSequence>
+                </EstimatedVehicleJourney>
+            </EstimatedJourneyVersionFrame>
+        </EstimatedTimetableDelivery>
+    </ServiceDelivery>
+</Siri>

From 43916251746dce62170a61d5b20240700721c0cd Mon Sep 17 00:00:00 2001
From: hfjelstad <hakon.fjelstad@entur.org>
Date: Wed, 11 Mar 2026 23:35:05 +0100
Subject: [PATCH 2/2] Updated the clean example

---
 .../OpRa_VR_Example_Clean.xml                 | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

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
index b5c1d17..23f11aa 100644
--- a/examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example_Clean.xml
+++ b/examples/Holistic_Example_NeTEx_SIRI_OpRa/OpRa_VR_Example_Clean.xml
@@ -11,7 +11,6 @@
         <opraFunctionalDeliveries>
             <PublicationDelivery version="1.0">
                 <siri:ResponseTimestamp>2026-03-09T13:37:00Z</siri:ResponseTimestamp>
-                
                 <!-- Minimal request header, no duplication of planned data -->
                 <ActualServiceRequest>
                     <siri:RequestTimestamp>2026-03-09T13:37:00Z</siri:RequestTimestamp>
@@ -19,14 +18,25 @@
                 </ActualServiceRequest>
                 
                 <dataObjects>
-                    
+                    <!-- Setting up the DataSource of SIRI and where to find it -->
+                    <netex:CompositeFrame id="ENT:CompositeFrame:1">
+                        <netex:frames>
+                            <netex:ResourceFrame id="ENT:ResourceFrame:1">
+                                <netex:dataSources>
+                                    <netex:DataSource id="VR:DataSource:SIRI">
+                                        <netex:Url>www.SIRI_MESSAGE_DATABASE.com</netex:Url>
+                                    </netex:DataSource>
+                                </netex:dataSources>
+                            </netex:ResourceFrame>
+                        </netex:frames>
+                    </netex:CompositeFrame>
                     <!-- (A) REFERANSE TIL PLAN (URL/ID), men uten å gjenskape plan -->
                     <PlannedServiceFrame>
-                        <NetexUrl>VR_InterCity.xml</NetexUrl>
+                        <NetexUrl>NeTEx_VR_Example.xml</NetexUrl>
                     </PlannedServiceFrame>
-                    
-                    <!-- (B) OBSERVERT/EMPIRISK LAG (kun actual og avledede målinger) -->
-                    <ActualServiceFrame>
+                                        <!-- (B) OBSERVERT/EMPIRISK LAG (kun actual og avledede målinger) -->
+                    <!-- Referencing the DataSource and a identifier to look up the message used for this ActualServiceFrame -->
+                    <ActualServiceFrame dataSourceRef="VR:DataSource:SIRI" derivedFromObjectRef="b752f9ddddca90638137a3efe1fdcde34d0ec17fa017934135a274d7ad8d2a59">
                         <NetexPayload>
                             <netex:CompositeFrame id="ENT:CompositeFrame:Observed-2026-01-04">
                                 <netex:frames>
@@ -143,6 +153,7 @@
                                     
                                     <!-- 2) FAKTISK STOPPSEKVENS (datedCalls), kun actual tider -->
                                     <netex:TimetableFrame id="ENT:TimetableFrame:Observed-2026-01-04" version="1">
+                                       
                                         <netex:vehicleJourneys>
                                             <netex:DatedVehicleJourney id="ENT:DatedVehicleJourney:Observed:VR:DatedServiceJourney:1_2026-01-04"
                                                 version="1"
@@ -235,6 +246,7 @@
                                                 </netex:datedCalls>
                                             </netex:DatedVehicleJourney>
                                         </netex:vehicleJourneys>
+                                    
                                     </netex:TimetableFrame>
                                     
                                 </netex:frames>