diff --git a/OJP/OJP_JourneySupport.xsd b/OJP/OJP_JourneySupport.xsd
index 986c8cbd0..bcf05ea15 100644
--- a/OJP/OJP_JourneySupport.xsd
+++ b/OJP/OJP_JourneySupport.xsd
@@ -367,7 +367,7 @@
 		</xs:annotation>
 		<xs:sequence>
 			<xs:group ref="ServiceTimeGroup"/>
-			<xs:element ref="siri:ArrivalFormationAssignment" minOccurs="0"/>
+			<xs:element ref="siri:ArrivalFormationAssignment" minOccurs="0" maxOccurs="unbounded"/>
 			<!-- comes with SIRI 2.1 -->
 			<!-- TODO the quays should be moved here, too -->
 		</xs:sequence>
diff --git a/docs/generated/index.html b/docs/generated/index.html
index 0b3835272..91a279656 100644
--- a/docs/generated/index.html
+++ b/docs/generated/index.html
@@ -1225,7 +1225,7 @@ <h1>OJP - <strong>O</strong>pen API for distributed <strong>J</strong>ourney <st
 			<!--======= row--><tr><td class="tableblock halign-left valign-top" rowspan="2"><a href="#EstimatedTimeBandGroup" title="EstimatedTimeBandGroup">EstimatedTimeBand</a></td><td class="tableblock halign-left valign-top" colspan="2"><p class="tableblock"><code>EstimatedTimeLow</code></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><span title="optional, single">0:1</span></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><em>xs:dateTime</em></p></td><td class="tableblock halign-left valign-top"><p class="tableblock">Estimated lower limit for time.</p></td></tr>
 			<!--======= row--><tr><td class="tableblock halign-left valign-top" colspan="2"><p class="tableblock"><code>EstimatedTimeHigh</code></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><span title="optional, single">0:1</span></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><em>xs:dateTime</em></p></td><td class="tableblock halign-left valign-top"><p class="tableblock">Estimated upper limit for time.</p></td></tr>
 		<!--Group EstimatedTimeBandGroup ──────┘-->
-		<!--Group ServiceTimeGroup ──────┘--><!--======= row--><tr><td class="tableblock halign-left valign-top"><p class="tableblock"/></td><td class="tableblock halign-left valign-top" colspan="2"><p class="tableblock"><code>→‍siri:ArrivalFormationAssignment</code></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><span title="optional, single">0:1</span></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><em>→‍siri:ArrivalFormationAssignment</em></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"/></td></tr></tbody></table></div></div><!--======================================= chapter ServiceDepartureStructure--><div id="ServiceDepartureStructure" class="sect2"><h3>12.20. The complex type <code xmlns="">ServiceDepartureStructure</code></h3><div class="sectionbody"><table class="tableblock frame-all grid-all spread"><colgroup><col style="width:11.9047619047619%"/><col style="width:1.19047619047619%"/><col style="width:11.9047619047619%"/><col style="width:1.19047619047619%"/><col style="width:23.8095238095238%"/><col style="width:35.7142857142857%"/></colgroup><tbody><!--======= type-description--><tr><td class="tableblock halign-left valign-top" colspan="4"><p class="tableblock"><code>ServiceDepartureStructure</code></p></td><td class="tableblock halign-left valign-top" colspan="1"><p class="tableblock"/></td><td class="tableblock halign-left valign-top"><p class="tableblock">Departure times of a service at a stop (group of attributes of TIMETABLED PASSING TIME, ESTIMATED PASSING TIME, OBSERVED PASSING TIME, equals MONITORED LEG DEPARTURE).</p></td></tr><!--======= line--><tr><td class="tableblock halign-left valign-top" colspan="6"><p class="tableblock">The element contains a <em xmlns="">sequence</em> of the following elements:</p></td></tr><!--Group ServiceTimeGroup ──────┐-->
+		<!--Group ServiceTimeGroup ──────┘--><!--======= row--><tr><td class="tableblock halign-left valign-top"><p class="tableblock"/></td><td class="tableblock halign-left valign-top" colspan="2"><p class="tableblock"><code>→‍siri:ArrivalFormationAssignment</code></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><span title="optional, multiple">0:*</span></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><em>→‍siri:ArrivalFormationAssignment</em></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"/></td></tr></tbody></table></div></div><!--======================================= chapter ServiceDepartureStructure--><div id="ServiceDepartureStructure" class="sect2"><h3>12.20. The complex type <code xmlns="">ServiceDepartureStructure</code></h3><div class="sectionbody"><table class="tableblock frame-all grid-all spread"><colgroup><col style="width:11.9047619047619%"/><col style="width:1.19047619047619%"/><col style="width:11.9047619047619%"/><col style="width:1.19047619047619%"/><col style="width:23.8095238095238%"/><col style="width:35.7142857142857%"/></colgroup><tbody><!--======= type-description--><tr><td class="tableblock halign-left valign-top" colspan="4"><p class="tableblock"><code>ServiceDepartureStructure</code></p></td><td class="tableblock halign-left valign-top" colspan="1"><p class="tableblock"/></td><td class="tableblock halign-left valign-top"><p class="tableblock">Departure times of a service at a stop (group of attributes of TIMETABLED PASSING TIME, ESTIMATED PASSING TIME, OBSERVED PASSING TIME, equals MONITORED LEG DEPARTURE).</p></td></tr><!--======= line--><tr><td class="tableblock halign-left valign-top" colspan="6"><p class="tableblock">The element contains a <em xmlns="">sequence</em> of the following elements:</p></td></tr><!--Group ServiceTimeGroup ──────┐-->
 			<!--======= row--><tr><td class="tableblock halign-left valign-top" rowspan="3"><a href="#ServiceTimeGroup" title="ServiceTimeGroup">ServiceTime</a></td><td class="tableblock halign-left valign-top" colspan="2"><p class="tableblock"><code><strong>TimetabledTime</strong></code></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><strong title="mandatory, single">1:1</strong></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><em>xs:dateTime</em></p></td><td class="tableblock halign-left valign-top"><p class="tableblock">time at point as it is published</p></td></tr>
 			<!--======= row--><tr><td class="tableblock halign-left valign-top" colspan="2"><p class="tableblock"><code>RecordedAtTime</code></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><span title="optional, single">0:1</span></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><em>xs:dateTime</em></p></td><td class="tableblock halign-left valign-top"><p class="tableblock">time as it was recorded</p></td></tr>
 			<!--======= row--><tr><td class="tableblock halign-left valign-top" colspan="2"><p class="tableblock"><code>EstimatedTime</code></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><span title="optional, single">0:1</span></p></td><td class="tableblock halign-left valign-top"><p class="tableblock"><em>xs:dateTime</em></p></td><td class="tableblock halign-left valign-top"><p class="tableblock">estimated time (for prognosis)</p></td></tr>