Add Arrowhead OPC UA tests
diff --git a/Arrowhead/Arrowhead/EventHandler/ArrowheadEvent.dtp b/Arrowhead/Arrowhead/EventHandler/ArrowheadEvent.dtp
new file mode 100644
index 0000000..daef7b7
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/ArrowheadEvent.dtp
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
+<DataType Name="ArrowheadEvent" Comment="Event type of the Arrowhead Framework" >
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2019-09-17" />
+  <ASN1Tag Class="APPLICATION" Number="1" />
+  <StructuredType >
+    <VarDeclaration Name="type" Type="WSTRING" Comment="The type of the event, an event ID of sorts." />
+	<VarDeclaration Name="payload" Type="WSTRING" Comment="String data of the event." />
+	<VarDeclaration Name="timestamp" Type="DATE_AND_TIME" Comment="Date and time of the event." />
+	<VarDeclaration Name="eventMetadata" Type="WSTRING" ArraySize="10" Comment="Key=value pairs of additional data about the event." />
+  </StructuredType>
+</DataType>
diff --git a/Arrowhead/Arrowhead/EventHandler/ArrowheadPublish.fbt b/Arrowhead/Arrowhead/EventHandler/ArrowheadPublish.fbt
new file mode 100644
index 0000000..9fa8283
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/ArrowheadPublish.fbt
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Publish event Function Block" Name="ArrowheadPublish">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Publish Event" Name="publish" Type="Event">
+        <With Var="publishEvent"/>
+        <With Var="endpoint"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Event was published" Name="published" Type="Event"/>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Publish event to be sent" Name="publishEvent" Type="PublishEvent"/>
+      <VarDeclaration Comment="Endpoint (IP:PORT/URI) of the Event Handler (not officially in the documentation, but it simplifies the FBs)" Name="endpoint" Type="WSTRING"/>
+    </InputVars>
+    <Plugs>
+      <AdapterDeclaration Comment="" Name="ArrowheadPublishAdp" Type="ArrowheadPublishAdp" x="2200.0" y="-200.0"/>
+    </Plugs>
+  </InterfaceList>
+  <FBNetwork>
+    <EventConnections>
+      <Connection Comment="" Destination="ArrowheadPublishAdp.publish" Source="publish" dx1="805.0"/>
+      <Connection Comment="" Destination="published" Source="ArrowheadPublishAdp.published" dx1="60.0" dx2="60.0" dy="55.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="ArrowheadPublishAdp.publishEvent" Source="publishEvent" dx1="805.0"/>
+      <Connection Comment="" Destination="ArrowheadPublishAdp.endpoint" Source="endpoint" dx1="805.0"/>
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/Arrowhead/EventHandler/ArrowheadPublishAdp.adp b/Arrowhead/Arrowhead/EventHandler/ArrowheadPublishAdp.adp
new file mode 100644
index 0000000..c832026
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/ArrowheadPublishAdp.adp
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE AdapterType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<AdapterType Comment="Publish event adapter" Name="ArrowheadPublishAdp">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <CompilerInfo header="package fb.test;"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Publish finished" Name="published" Type="Event"/>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Publish event" Name="publish" Type="Event">
+        <With Var="publishEvent"/>
+        <With Var="endpoint"/>
+      </Event>
+    </EventOutputs>
+    <OutputVars>
+      <VarDeclaration Comment="Publish event to be sent" Name="publishEvent" Type="PublishEvent"/>
+      <VarDeclaration Comment="Endpoint (IP:PORT/URI) of the Event Handler (not officially in the documentation, but it simplifies the FBs)" Name="endpoint" Type="WSTRING"/>
+    </OutputVars>
+  </InterfaceList>
+  <Service Comment="Publish event adapter" LeftInterface="SOCKET" RightInterface="PLUG">
+    <ServiceSequence Comment="" Name="request_confirm">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ" Interface="SOCKET" Parameters="REQD"/>
+        <OutputPrimitive Event="REQ" Interface="PLUG" Parameters="REQD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="CNF" Interface="PLUG" Parameters="CNFD"/>
+        <OutputPrimitive Event="CNF" Interface="SOCKET" Parameters="CNFD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="indication_response">
+      <ServiceTransaction>
+        <InputPrimitive Event="IND" Interface="PLUG" Parameters="INDD"/>
+        <OutputPrimitive Event="IND" Interface="SOCKET" Parameters="INDD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="RSP" Interface="SOCKET" Parameters="RSPD"/>
+        <OutputPrimitive Event="RSP" Interface="PLUG" Parameters="RSPD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</AdapterType>
diff --git a/Arrowhead/Arrowhead/EventHandler/EventFilter.dtp b/Arrowhead/Arrowhead/EventHandler/EventFilter.dtp
new file mode 100644
index 0000000..aa937ab
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/EventFilter.dtp
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
+<DataType Name="EventFilter" Comment="EventFilter type used to subsribe/unsubscribe to/from the EventHandler" >
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2019-09-17" />
+  <ASN1Tag Class="APPLICATION" Number="1" />
+  <StructuredType >
+    <VarDeclaration Name="eventType" Type="WSTRING" Comment="Event type, similar to topics in MQTT." />
+    <VarDeclaration Name="consumer" Type="ArrowheadSystem" Comment="The Subscriber ArrowheadSystem, that will consume the new events." />
+    <VarDeclaration Name="sources" Type="ArrowheadSystem" ArraySize="10" Comment="List of ArrowheadSystem the Subscriber wants to receive events from." />
+	<VarDeclaration Name="startDate" Type="DATE_AND_TIME" Comment="If set, the Subscriber wants to receive events with timestamps after this date-time." />
+	<VarDeclaration Name="endDate" Type="DATE_AND_TIME" Comment="If set, the Subscriber wants to receive events with timestamps before this date-time." />
+	<VarDeclaration Name="filterMetadata" Type="WSTRING" ArraySize="10" Comment="Metadata about the events, which can be used for further filtering." />
+	<VarDeclaration Name="notifyUri" Type="WSTRING" Comment="The URL subpath where the Event Handler should sent the new events to." />
+	<VarDeclaration Name="matchMetadata" Type="BOOL" Comment="Should the Event Handler filter events based on the metadata." />
+  </StructuredType>
+</DataType>
diff --git a/Arrowhead/Arrowhead/EventHandler/FieldsToArrowheadEvent.fbt b/Arrowhead/Arrowhead/EventHandler/FieldsToArrowheadEvent.fbt
new file mode 100644
index 0000000..1bdba70
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/FieldsToArrowheadEvent.fbt
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Transform individual fields to an Arrowhead Event type" Name="FieldsToArrowheadEvent">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-10-17" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Normal Execution Request" Name="REQ" Type="Event">
+        <With Var="type"/>
+        <With Var="payload"/>
+        <With Var="timestamp"/>
+        <With Var="eventMetadata"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Execution Confirmation" Name="CNF" Type="Event">
+        <With Var="arrowheadEvent"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="The type of the event, an event ID of sorts" Name="type" Type="WSTRING"/>
+      <VarDeclaration Comment="String data of the event" Name="payload" Type="WSTRING"/>
+      <VarDeclaration Comment="Date and time of the event" Name="timestamp" Type="DATE_AND_TIME"/>
+      <VarDeclaration ArraySize="10" Comment="Key=value pairs of additional data about the event" Name="eventMetadata" Type="WSTRING"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Created Arrowhead event" Name="arrowheadEvent" Type="ArrowheadEvent"/>
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC>
+      <ECState Comment="Initial State" Name="START" x="1565.0" y="695.0"/>
+      <ECState Comment="" Name="REQ" x="780.0" y="1215.0">
+        <ECAction Algorithm="REQ" Output="CNF"/>
+      </ECState>
+      <ECTransition Comment="" Condition="1" Destination="START" Source="REQ" x="725.0" y="690.0"/>
+      <ECTransition Comment="" Condition="REQ" Destination="REQ" Source="START" x="1295.0" y="1005.0"/>
+    </ECC>
+    <Algorithm Comment="Initialization algorithm" Name="REQ">
+      <ST Text="VAR&#13;&#10;  i: INT;&#13;&#10;END_VAR;&#13;&#10;&#13;&#10;i := 0;&#13;&#10;arrowheadEvent.type := type; &#13;&#10;arrowheadEvent.payload := payload;&#13;&#10;arrowheadEvent.timestamp = timestamp;&#13;&#10;&#13;&#10;WHILE i &lt; 10 DO //looks like while is faster than FOR when exporting to cpp&#13;&#10;  arrowheadEvent.eventMetadata[i] :=  eventMetadata[i];&#13;&#10;  i := i + 1;&#13;&#10;END_WHILE"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/Arrowhead/EventHandler/FieldsToEventFilter.fbt b/Arrowhead/Arrowhead/EventHandler/FieldsToEventFilter.fbt
new file mode 100644
index 0000000..6d488ad
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/FieldsToEventFilter.fbt
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Transform individual fields to an Arrowhead Event Filter type" Name="FieldsToEventFilter">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Normal Execution Request" Name="REQ" Type="Event">
+        <With Var="eventType"/>
+        <With Var="consumer"/>
+        <With Var="startDate"/>
+        <With Var="notifyUri"/>
+        <With Var="sources"/>
+        <With Var="endDate"/>
+        <With Var="filterMetadata"/>
+        <With Var="matchMetadata"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Execution Confirmation" Name="CNF" Type="Event">
+        <With Var="eventFilter"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Event type, similar to topics in MQTT" Name="eventType" Type="WSTRING"/>
+      <VarDeclaration Comment="The Subscriber ArrowheadSystem, that will consume the new events" Name="consumer" Type="ArrowheadSystem"/>
+      <VarDeclaration ArraySize="10" Comment="List of ArrowheadSystem the Subscriber wants to receive events from" Name="sources" Type="ArrowheadSystem"/>
+      <VarDeclaration Comment="If set, the Subscriber wants to receive events with timestamps after this date-time" Name="startDate" Type="DATE_AND_TIME"/>
+      <VarDeclaration Comment="If set, the Subscriber wants to receive events with timestamps before this date-time" Name="endDate" Type="DATE_AND_TIME"/>
+      <VarDeclaration ArraySize="10" Comment="Metadata about the events, which can be used for further filtering in format key=value" Name="filterMetadata" Type="WSTRING"/>
+      <VarDeclaration Comment="The URL subpath where the Event Handler should sent the new events to" Name="notifyUri" Type="WSTRING"/>
+      <VarDeclaration Comment="Should the Event Handler filter events based on the metadata" Name="matchMetadata" Type="BOOL"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Created Arrowhead event Filter" Name="eventFilter" Type="EventFilter"/>
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC>
+      <ECState Comment="Initial State" Name="START" x="1565.0" y="695.0"/>
+      <ECState Comment="" Name="REQ" x="780.0" y="1215.0">
+        <ECAction Algorithm="REQ" Output="CNF"/>
+      </ECState>
+      <ECTransition Comment="" Condition="1" Destination="START" Source="REQ" x="725.0" y="690.0"/>
+      <ECTransition Comment="" Condition="REQ" Destination="REQ" Source="START" x="1295.0" y="1005.0"/>
+    </ECC>
+    <Algorithm Comment="Initialization algorithm" Name="REQ">
+      <ST Text="VAR&#13;&#10;  i: INT;&#13;&#10;END_VAR;&#13;&#10;&#13;&#10;i := 0;&#13;&#10;eventFilter.eventType := eventType; &#13;&#10;eventFilter.consumer := consumer;&#13;&#10;eventFilter.startDate := startDate;&#13;&#10;eventFilter.endDate := endDate;&#13;&#10;eventFilter.notifyUri := notifyUri;&#13;&#10;eventFilter.matchMetadata := matchMetadata;&#13;&#10;&#13;&#10;WHILE i &lt; 10 DO //looks like while is faster than FOR when exporting to cpp&#13;&#10;  eventFilter.sources[i] := sources[i];&#13;&#10;  eventFilter.filterMetadata[i] :=  filterMetadata[i];&#13;&#10;  i := i + 1;&#13;&#10;END_WHILE"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/Arrowhead/EventHandler/FieldsToPublishEvent.fbt b/Arrowhead/Arrowhead/EventHandler/FieldsToPublishEvent.fbt
new file mode 100644
index 0000000..abd639d
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/FieldsToPublishEvent.fbt
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Transform individual fields to an Arrowhead Publish Event" Name="FieldsToPublishEvent">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-10-17" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Normal Execution Request" Name="REQ" Type="Event">
+        <With Var="source"/>
+        <With Var="event"/>
+        <With Var="deliveryCompleteUri"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Execution Confirmation" Name="CNF" Type="Event">
+        <With Var="publishEvent"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="ArrowheadSystem publishing the event" Name="source" Type="ArrowheadSystem"/>
+      <VarDeclaration Comment="The published event" Name="event" Type="ArrowheadEvent"/>
+      <VarDeclaration Comment="The URL subpath the Event Handler can use to inform the publisher about the results of the event propagation. If null, the Event Handler will not try to send the results" Name="deliveryCompleteUri" Type="WSTRING"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Created publish event" Name="publishEvent" Type="PublishEvent"/>
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC>
+      <ECState Comment="Initial State" Name="START" x="1565.0" y="695.0"/>
+      <ECState Comment="" Name="REQ" x="780.0" y="1215.0">
+        <ECAction Algorithm="REQ" Output="CNF"/>
+      </ECState>
+      <ECTransition Comment="" Condition="1" Destination="START" Source="REQ" x="725.0" y="690.0"/>
+      <ECTransition Comment="" Condition="REQ" Destination="REQ" Source="START" x="1315.0" y="1020.0"/>
+    </ECC>
+    <Algorithm Comment="Initialization algorithm" Name="REQ">
+      <ST Text="publishEvent.source := source; &#13;&#10;publishEvent.event := event;&#13;&#10;publishEvent.deliveryCompleteUri := deliveryCompleteUri;&#13;&#10;&#13;&#10;"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/Arrowhead/EventHandler/HTTP/PublishEventHTTP.fbt b/Arrowhead/Arrowhead/EventHandler/HTTP/PublishEventHTTP.fbt
new file mode 100644
index 0000000..2c4129f
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/HTTP/PublishEventHTTP.fbt
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Publish event using HTTP" Name="PublishEventHTTP">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <Sockets>
+      <AdapterDeclaration Comment="Publish Event adapter" Name="publishEvent" Type="ArrowheadPublishAdp" x="1300.0" y="700.0"/>
+    </Sockets>
+  </InterfaceList>
+  <FBNetwork>
+    <FB Comment="" Name="ANYToJSON" Type="ANYToJSON" x="4560.0" y="335.0"/>
+    <FB Comment="" Name="InitFlag" Type="E_SR" x="8075.0" y="625.0"/>
+    <FB Comment="" Name="APPEND_STRING_3" Type="APPEND_STRING_3" x="5400.0" y="1000.0">
+      <Parameter Name="IN_1" Value="STRING#http["/>
+      <Parameter Name="IN_3" Value="STRING#/publish; POST; application/json]"/>
+    </FB>
+    <FB Comment="" Name="F_STRING_TO_WSTRING" Type="F_STRING_TO_WSTRING" x="6795.0" y="1025.0"/>
+    <FB Comment="" Name="Query" Type="CLIENT_1_2" x="9700.0" y="610.0"/>
+    <FB Comment="" Name="E_PERMIT" Type="E_PERMIT" x="8940.0" y="-250.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="Query.REQ" Source="E_PERMIT.EO" dx1="225.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.REQ" Source="APPEND_STRING_3.CNF" dx1="285.0"/>
+      <Connection Comment="" Destination="Query.INIT" Source="InitFlag.EO" dx1="295.0"/>
+      <Connection Comment="" Destination="APPEND_STRING_3.REQ" Source="ANYToJSON.CNF" dx1="180.0"/>
+      <Connection Comment="" Destination="InitFlag.S" Source="F_STRING_TO_WSTRING.CNF" dx1="190.0"/>
+      <Connection Comment="" Destination="E_PERMIT.EI" Source="Query.INITO" dx1="60.0" dx2="60.0" dy="-1290.0"/>
+      <Connection Comment="" Destination="InitFlag.R" Source="Query.CNF" dx1="260.0" dx2="150.0" dy="-1650.0"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="publishEvent.publish" dx1="1110.0"/>
+      <Connection Comment="" Destination="publishEvent.published" Source="Query.CNF" dx1="990.0" dx2="60.0" dy="-1930.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="Query.SD_1" Source="ANYToJSON.output" dx1="4045.0"/>
+      <Connection Comment="" Destination="Query.QI" Source="InitFlag.Q" dx1="370.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.IN" Source="APPEND_STRING_3.OUT" dx1="285.0"/>
+      <Connection Comment="" Destination="Query.ID" Source="F_STRING_TO_WSTRING.OUT" dx1="840.0"/>
+      <Connection Comment="" Destination="E_PERMIT.PERMIT" Source="InitFlag.Q" dx1="205.0"/>
+      <Connection Comment="" Destination="ANYToJSON.input" Source="publishEvent.publishEvent" dx1="1430.0"/>
+      <Connection Comment="" Destination="APPEND_STRING_3.IN_2" Source="publishEvent.endpoint" dx1="1530.0"/>
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/Arrowhead/EventHandler/HTTP/SubscribeEventHTTP.fbt b/Arrowhead/Arrowhead/EventHandler/HTTP/SubscribeEventHTTP.fbt
new file mode 100644
index 0000000..a2b9192
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/HTTP/SubscribeEventHTTP.fbt
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Subscribe event using HTTP" Name="SubscribeEventHTTP">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-09-18" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <Sockets>
+      <AdapterDeclaration Comment="SubscribeEvent adapter" Name="SubscribeEventAdp" Type="SubscribeEventAdp" x="1000.0" y="800.0"/>
+    </Sockets>
+  </InterfaceList>
+  <FBNetwork>
+    <FB Comment="" Name="InitFlagReg" Type="E_SR" x="9495.0" y="-505.0"/>
+    <FB Comment="" Name="E_PERMIT" Type="E_PERMIT" x="11185.0" y="-900.0"/>
+    <FB Comment="" Name="InitFlagUnReg" Type="E_SR" x="9485.0" y="1200.0"/>
+    <FB Comment="" Name="F_STRING_TO_WSTRING" Type="F_STRING_TO_WSTRING" x="6685.0" y="-300.0"/>
+    <FB Comment="" Name="CreateRegisterID" Type="APPEND_STRING_3" x="5485.0" y="-300.0">
+      <Parameter Name="IN_1" Value="STRING#http["/>
+      <Parameter Name="IN_3" Value="STRING#/subscription; POST; application/json]"/>
+    </FB>
+    <FB Comment="" Name="ANYToJSON" Type="ANYToJSON" x="8085.0" y="705.0"/>
+    <FB Comment="" Name="E_PERMIT_1" Type="E_PERMIT" x="11185.0" y="900.0"/>
+    <FB Comment="" Name="Register" Type="CLIENT_1_2" x="12200.0" y="-500.0"/>
+    <FB Comment="" Name="Unregister" Type="CLIENT_1_2" x="12175.0" y="1600.0"/>
+    <FB Comment="" Name="CreateRegisterID_1" Type="APPEND_STRING_3" x="5500.0" y="1500.0">
+      <Parameter Name="IN_1" Value="STRING#http["/>
+      <Parameter Name="IN_3" Value="STRING#/subscription; PUT; application/json]"/>
+    </FB>
+    <FB Comment="" Name="F_STRING_TO_WSTRING_2" Type="F_STRING_TO_WSTRING" x="6700.0" y="1500.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="E_PERMIT.EI" Source="Register.INITO" dx1="60.0" dx2="60.0" dy="-720.0"/>
+      <Connection Comment="" Destination="InitFlagReg.R" Source="Register.CNF" dx1="325.0" dx2="265.0" dy="-975.0"/>
+      <Connection Comment="" Destination="Register.INIT" Source="InitFlagReg.EO" dx1="1160.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.REQ" Source="CreateRegisterID.CNF"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="F_STRING_TO_WSTRING.CNF" dx1="265.0"/>
+      <Connection Comment="" Destination="Register.REQ" Source="E_PERMIT.EO" dx1="290.0"/>
+      <Connection Comment="" Destination="InitFlagReg.S" Source="F_STRING_TO_WSTRING.CNF" dx1="955.0"/>
+      <Connection Comment="" Destination="CreateRegisterID.REQ" Source="SubscribeEventAdp.Subscribe" dx1="975.0"/>
+      <Connection Comment="" Destination="SubscribeEventAdp.Subscribed" Source="Register.CNF" dx1="540.0" dx2="60.0" dy="-1415.0"/>
+      <Connection Comment="" Destination="Unregister.INIT" Source="InitFlagUnReg.EO" dx1="1085.0"/>
+      <Connection Comment="" Destination="Unregister.REQ" Source="E_PERMIT_1.EO" dx1="290.0"/>
+      <Connection Comment="" Destination="E_PERMIT_1.EI" Source="Unregister.INITO" dx1="60.0" dx2="60.0" dy="-1155.0"/>
+      <Connection Comment="" Destination="SubscribeEventAdp.Unsubscribed" Source="Unregister.CNF" dx1="680.0" dx2="60.0" dy="4405.0"/>
+      <Connection Comment="" Destination="InitFlagUnReg.R" Source="Unregister.CNF" dx1="350.0" dx2="290.0" dy="-1435.0"/>
+      <Connection Comment="" Destination="CreateRegisterID_1.REQ" Source="SubscribeEventAdp.Unsubscribe" dx1="385.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING_2.REQ" Source="CreateRegisterID_1.CNF"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="F_STRING_TO_WSTRING_2.CNF" dx1="355.0"/>
+      <Connection Comment="" Destination="InitFlagUnReg.S" Source="F_STRING_TO_WSTRING_2.CNF" dx1="1260.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="E_PERMIT_1.PERMIT" Source="InitFlagUnReg.Q" dx1="720.0"/>
+      <Connection Comment="" Destination="Register.QI" Source="InitFlagReg.Q" dx1="1160.0"/>
+      <Connection Comment="" Destination="Register.SD_1" Source="ANYToJSON.output" dx1="2355.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.IN" Source="CreateRegisterID.OUT"/>
+      <Connection Comment="" Destination="Register.ID" Source="F_STRING_TO_WSTRING.OUT"/>
+      <Connection Comment="" Destination="E_PERMIT.PERMIT" Source="InitFlagReg.Q" dx1="790.0"/>
+      <Connection Comment="" Destination="CreateRegisterID.IN_2" Source="SubscribeEventAdp.endpoint" dx1="1675.0"/>
+      <Connection Comment="" Destination="ANYToJSON.input" Source="SubscribeEventAdp.eventFilter" dx1="2975.0"/>
+      <Connection Comment="" Destination="Unregister.QI" Source="InitFlagUnReg.Q" dx1="725.0"/>
+      <Connection Comment="" Destination="CreateRegisterID_1.IN_2" Source="SubscribeEventAdp.endpoint" dx1="1335.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING_2.IN" Source="CreateRegisterID_1.OUT"/>
+      <Connection Comment="" Destination="Unregister.ID" Source="F_STRING_TO_WSTRING_2.OUT" dx1="2605.0"/>
+      <Connection Comment="" Destination="Unregister.SD_1" Source="ANYToJSON.output" dx1="1750.0"/>
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/Arrowhead/EventHandler/OpcUa/PublishEventOpcUa.fbt b/Arrowhead/Arrowhead/EventHandler/OpcUa/PublishEventOpcUa.fbt
new file mode 100644
index 0000000..03677ff
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/OpcUa/PublishEventOpcUa.fbt
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Publish event using OPC UA" Name="PublishEventOpcUa">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <Sockets>
+      <AdapterDeclaration Comment="Publish Event adapter" Name="publishEvent" Type="ArrowheadPublishAdp" x="1300.0" y="700.0"/>
+    </Sockets>
+  </InterfaceList>
+  <FBNetwork>
+    <FB Comment="" Name="ANYToJSON" Type="ANYToJSON" x="4560.0" y="335.0"/>
+    <FB Comment="" Name="InitFlag" Type="E_SR" x="8075.0" y="625.0"/>
+    <FB Comment="" Name="APPEND_STRING_3" Type="APPEND_STRING_3" x="5400.0" y="1000.0">
+      <Parameter Name="IN_1" Value="STRING#opc_ua[CALL_METHOD; "/>
+      <Parameter Name="IN_3" Value="STRING##; /Objects/2:EventHandler/2:publish]"/>
+    </FB>
+    <FB Comment="" Name="F_STRING_TO_WSTRING" Type="F_STRING_TO_WSTRING" x="6795.0" y="1025.0"/>
+    <FB Comment="" Name="E_PERMIT" Type="E_PERMIT" x="8700.0" y="-200.0"/>
+    <FB Comment="" Name="E_SWITCH_2" Type="E_SWITCH" x="11100.0" y="800.0"/>
+    <FB Comment="" Name="E_SWITCH_1_1" Type="E_SWITCH" x="13000.0" y="700.0"/>
+    <FB Comment="" Name="E_CTU_1" Type="E_CTU" x="12200.0" y="800.0">
+      <Parameter Name="PV" Value="UINT#3"/>
+    </FB>
+    <FB Comment="" Name="E_DELAY_1" Type="E_DELAY" x="14600.0" y="700.0">
+      <Parameter Name="DT" Value="T#250ms"/>
+    </FB>
+    <FB Comment="" Name="Query" Type="CLIENT_1_0" x="9700.0" y="610.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.REQ" Source="APPEND_STRING_3.CNF" dx1="285.0"/>
+      <Connection Comment="" Destination="APPEND_STRING_3.REQ" Source="ANYToJSON.CNF" dx1="180.0"/>
+      <Connection Comment="" Destination="InitFlag.S" Source="F_STRING_TO_WSTRING.CNF" dx1="190.0"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="publishEvent.publish" dx1="1110.0"/>
+      <Connection Comment="" Destination="E_CTU_1.R" Source="E_SWITCH_2.EO1"/>
+      <Connection Comment="" Destination="E_CTU_1.R" Source="E_SWITCH_1_1.EO1" dx1="60.0" dx2="60.0" dy="-505.0"/>
+      <Connection Comment="" Destination="E_CTU_1.CU" Source="E_SWITCH_2.EO0"/>
+      <Connection Comment="" Destination="E_SWITCH_1_1.EI" Source="E_CTU_1.CUO" dx1="230.0"/>
+      <Connection Comment="" Destination="E_DELAY_1.START" Source="E_SWITCH_1_1.EO0"/>
+      <Connection Comment="" Destination="publishEvent.published" Source="E_SWITCH_2.EO1" dx1="445.0" dx2="60.0" dy="-1930.0"/>
+      <Connection Comment="" Destination="InitFlag.R" Source="E_SWITCH_2.EO1" dx1="260.0" dx2="150.0" dy="-1650.0"/>
+      <Connection Comment="" Destination="Query.INIT" Source="InitFlag.EO" dx1="295.0"/>
+      <Connection Comment="" Destination="Query.REQ" Source="E_PERMIT.EO" dx1="225.0"/>
+      <Connection Comment="" Destination="Query.REQ" Source="E_DELAY_1.EO" dx1="60.0" dx2="60.0" dy="-1010.0"/>
+      <Connection Comment="" Destination="E_PERMIT.EI" Source="Query.INITO" dx1="60.0" dx2="60.0" dy="-1290.0"/>
+      <Connection Comment="" Destination="E_SWITCH_2.EI" Source="Query.CNF" dx1="420.0"/>
+      <Connection Comment="" Destination="InitFlag.R" Source="E_SWITCH_1_1.EO1" dx1="60.0" dx2="60.0" dy="785.0"/>
+      <Connection Comment="" Destination="publishEvent.published" Source="E_SWITCH_1_1.EO1" dx1="60.0" dx2="600.0" dy="1580.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.IN" Source="APPEND_STRING_3.OUT" dx1="285.0"/>
+      <Connection Comment="" Destination="E_PERMIT.PERMIT" Source="InitFlag.Q" dx1="205.0"/>
+      <Connection Comment="" Destination="ANYToJSON.input" Source="publishEvent.publishEvent" dx1="1430.0"/>
+      <Connection Comment="" Destination="APPEND_STRING_3.IN_2" Source="publishEvent.endpoint" dx1="1530.0"/>
+      <Connection Comment="" Destination="E_SWITCH_1_1.G" Source="E_CTU_1.Q" dx1="230.0"/>
+      <Connection Comment="" Destination="Query.QI" Source="InitFlag.Q" dx1="370.0"/>
+      <Connection Comment="" Destination="Query.ID" Source="F_STRING_TO_WSTRING.OUT" dx1="840.0"/>
+      <Connection Comment="" Destination="Query.SD_1" Source="ANYToJSON.output" dx1="4045.0"/>
+      <Connection Comment="" Destination="E_SWITCH_2.G" Source="Query.QO" dx1="420.0"/>
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/Arrowhead/EventHandler/OpcUa/SubscribeEventOpcUa.fbt b/Arrowhead/Arrowhead/EventHandler/OpcUa/SubscribeEventOpcUa.fbt
new file mode 100644
index 0000000..f0cf782
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/OpcUa/SubscribeEventOpcUa.fbt
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Subscribe event using OPC UA" Name="SubscribeEventOpcUa">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-09-18" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <Sockets>
+      <AdapterDeclaration Comment="SubscribeEvent adapter" Name="SubscribeEventAdp" Type="SubscribeEventAdp" x="1000.0" y="800.0"/>
+    </Sockets>
+  </InterfaceList>
+  <FBNetwork>
+    <FB Comment="" Name="InitFlagReg" Type="E_SR" x="9495.0" y="-505.0"/>
+    <FB Comment="" Name="E_PERMIT" Type="E_PERMIT" x="11185.0" y="-900.0"/>
+    <FB Comment="" Name="InitFlagUnReg" Type="E_SR" x="9485.0" y="1200.0"/>
+    <FB Comment="" Name="F_STRING_TO_WSTRING" Type="F_STRING_TO_WSTRING" x="6685.0" y="-300.0"/>
+    <FB Comment="" Name="CreateRegisterID" Type="APPEND_STRING_3" x="5485.0" y="-300.0">
+      <Parameter Name="IN_1" Value="STRING#opc_ua[CALL_METHOD; "/>
+      <Parameter Name="IN_3" Value="STRING##; /Objects/2:EventHandler/2:subscribe]"/>
+    </FB>
+    <FB Comment="" Name="ANYToJSON" Type="ANYToJSON" x="8085.0" y="705.0"/>
+    <FB Comment="" Name="E_PERMIT_1" Type="E_PERMIT" x="11185.0" y="900.0"/>
+    <FB Comment="" Name="CreateRegisterID_1" Type="APPEND_STRING_3" x="5500.0" y="1500.0">
+      <Parameter Name="IN_1" Value="STRING#opc_ua[CALL_METHOD; "/>
+      <Parameter Name="IN_3" Value="STRING##; /Objects/2:EventHandler/2:unsubscribe]"/>
+    </FB>
+    <FB Comment="" Name="F_STRING_TO_WSTRING_2" Type="F_STRING_TO_WSTRING" x="6700.0" y="1500.0"/>
+    <FB Comment="" Name="Register" Type="CLIENT_1_0" x="12200.0" y="-500.0"/>
+    <FB Comment="" Name="Unregister" Type="CLIENT_1_0" x="12175.0" y="1600.0"/>
+    <FB Comment="" Name="E_DELAY_1" Type="E_DELAY" x="17000.0" y="1600.0">
+      <Parameter Name="DT" Value="T#250ms"/>
+    </FB>
+    <FB Comment="" Name="E_SWITCH_1_1" Type="E_SWITCH" x="15400.0" y="1600.0"/>
+    <FB Comment="" Name="E_SWITCH_2" Type="E_SWITCH" x="13500.0" y="1700.0"/>
+    <FB Comment="" Name="E_CTU_1" Type="E_CTU" x="14600.0" y="1600.0">
+      <Parameter Name="PV" Value="UINT#3"/>
+    </FB>
+    <FB Comment="" Name="E_DELAY_1_1" Type="E_DELAY" x="17200.0" y="-800.0">
+      <Parameter Name="DT" Value="T#250ms"/>
+    </FB>
+    <FB Comment="" Name="E_SWITCH_1_1_1" Type="E_SWITCH" x="15600.0" y="-800.0"/>
+    <FB Comment="" Name="E_SWITCH_2_1" Type="E_SWITCH" x="13700.0" y="-700.0"/>
+    <FB Comment="" Name="E_CTU_1_1" Type="E_CTU" x="14800.0" y="-800.0">
+      <Parameter Name="PV" Value="UINT#3"/>
+    </FB>
+    <EventConnections>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.REQ" Source="CreateRegisterID.CNF"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="F_STRING_TO_WSTRING.CNF" dx1="265.0"/>
+      <Connection Comment="" Destination="InitFlagReg.S" Source="F_STRING_TO_WSTRING.CNF" dx1="955.0"/>
+      <Connection Comment="" Destination="CreateRegisterID.REQ" Source="SubscribeEventAdp.Subscribe" dx1="975.0"/>
+      <Connection Comment="" Destination="CreateRegisterID_1.REQ" Source="SubscribeEventAdp.Unsubscribe" dx1="385.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING_2.REQ" Source="CreateRegisterID_1.CNF"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="F_STRING_TO_WSTRING_2.CNF" dx1="350.0"/>
+      <Connection Comment="" Destination="InitFlagUnReg.S" Source="F_STRING_TO_WSTRING_2.CNF" dx1="1260.0"/>
+      <Connection Comment="" Destination="Register.INIT" Source="InitFlagReg.EO" dx1="1110.0"/>
+      <Connection Comment="" Destination="Register.REQ" Source="E_PERMIT.EO" dx1="290.0"/>
+      <Connection Comment="" Destination="E_PERMIT.EI" Source="Register.INITO" dx1="60.0" dx2="60.0" dy="-720.0"/>
+      <Connection Comment="" Destination="Unregister.INIT" Source="InitFlagUnReg.EO" dx1="1085.0"/>
+      <Connection Comment="" Destination="Unregister.REQ" Source="E_PERMIT_1.EO" dx1="290.0"/>
+      <Connection Comment="" Destination="E_PERMIT_1.EI" Source="Unregister.INITO" dx1="60.0" dx2="60.0" dy="-1070.0"/>
+      <Connection Comment="" Destination="E_CTU_1.R" Source="E_SWITCH_2.EO1" dx1="310.0"/>
+      <Connection Comment="" Destination="E_CTU_1.R" Source="E_SWITCH_1_1.EO1" dx1="60.0" dx2="60.0" dy="-505.0"/>
+      <Connection Comment="" Destination="E_SWITCH_1_1.EI" Source="E_CTU_1.CUO"/>
+      <Connection Comment="" Destination="E_CTU_1.CU" Source="E_SWITCH_2.EO0" dx1="310.0"/>
+      <Connection Comment="" Destination="E_DELAY_1.START" Source="E_SWITCH_1_1.EO0"/>
+      <Connection Comment="" Destination="E_CTU_1_1.R" Source="E_SWITCH_2_1.EO1" dx1="310.0"/>
+      <Connection Comment="" Destination="E_CTU_1_1.R" Source="E_SWITCH_1_1_1.EO1" dx1="60.0" dx2="60.0" dy="-505.0"/>
+      <Connection Comment="" Destination="E_SWITCH_1_1_1.EI" Source="E_CTU_1_1.CUO"/>
+      <Connection Comment="" Destination="E_CTU_1_1.CU" Source="E_SWITCH_2_1.EO0" dx1="310.0"/>
+      <Connection Comment="" Destination="E_DELAY_1_1.START" Source="E_SWITCH_1_1_1.EO0"/>
+      <Connection Comment="" Destination="SubscribeEventAdp.Unsubscribed" Source="E_SWITCH_2.EO1" dx1="60.0" dx2="60.0" dy="1790.0"/>
+      <Connection Comment="" Destination="InitFlagUnReg.R" Source="E_SWITCH_2.EO1" dx1="60.0" dx2="60.0" dy="-1520.0"/>
+      <Connection Comment="" Destination="E_SWITCH_2.EI" Source="Unregister.CNF"/>
+      <Connection Comment="" Destination="Unregister.REQ" Source="E_DELAY_1.EO" dx1="60.0" dx2="60.0" dy="-940.0"/>
+      <Connection Comment="" Destination="InitFlagUnReg.R" Source="E_SWITCH_1_1.EO1" dx1="60.0" dx2="60.0" dy="640.0"/>
+      <Connection Comment="" Destination="SubscribeEventAdp.Unsubscribed" Source="E_SWITCH_1_1.EO1" dx1="185.0" dx2="620.0" dy="3460.0"/>
+      <Connection Comment="" Destination="SubscribeEventAdp.Subscribed" Source="E_SWITCH_2_1.EO1" dx1="115.0" dx2="60.0" dy="-1415.0"/>
+      <Connection Comment="" Destination="InitFlagReg.R" Source="E_SWITCH_2_1.EO1" dx1="225.0" dx2="265.0" dy="-975.0"/>
+      <Connection Comment="" Destination="E_SWITCH_2_1.EI" Source="Register.CNF" dx1="470.0"/>
+      <Connection Comment="" Destination="Register.REQ" Source="E_DELAY_1_1.EO" dx1="60.0" dx2="60.0" dy="-635.0"/>
+      <Connection Comment="" Destination="InitFlagReg.R" Source="E_SWITCH_1_1_1.EO1" dx1="60.0" dx2="60.0" dy="-650.0"/>
+      <Connection Comment="" Destination="SubscribeEventAdp.Subscribed" Source="E_SWITCH_1_1_1.EO1" dx1="60.0" dx2="170.0" dy="750.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="E_PERMIT_1.PERMIT" Source="InitFlagUnReg.Q" dx1="720.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.IN" Source="CreateRegisterID.OUT"/>
+      <Connection Comment="" Destination="E_PERMIT.PERMIT" Source="InitFlagReg.Q" dx1="790.0"/>
+      <Connection Comment="" Destination="CreateRegisterID.IN_2" Source="SubscribeEventAdp.endpoint" dx1="1675.0"/>
+      <Connection Comment="" Destination="ANYToJSON.input" Source="SubscribeEventAdp.eventFilter" dx1="2975.0"/>
+      <Connection Comment="" Destination="CreateRegisterID_1.IN_2" Source="SubscribeEventAdp.endpoint" dx1="1335.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING_2.IN" Source="CreateRegisterID_1.OUT"/>
+      <Connection Comment="" Destination="Register.QI" Source="InitFlagReg.Q" dx1="1110.0"/>
+      <Connection Comment="" Destination="Register.ID" Source="F_STRING_TO_WSTRING.OUT"/>
+      <Connection Comment="" Destination="Register.SD_1" Source="ANYToJSON.output" dx1="2355.0"/>
+      <Connection Comment="" Destination="Unregister.QI" Source="InitFlagUnReg.Q" dx1="725.0"/>
+      <Connection Comment="" Destination="Unregister.ID" Source="F_STRING_TO_WSTRING_2.OUT" dx1="2605.0"/>
+      <Connection Comment="" Destination="Unregister.SD_1" Source="ANYToJSON.output" dx1="1750.0"/>
+      <Connection Comment="" Destination="E_SWITCH_1_1.G" Source="E_CTU_1.Q"/>
+      <Connection Comment="" Destination="E_SWITCH_1_1_1.G" Source="E_CTU_1_1.Q"/>
+      <Connection Comment="" Destination="E_SWITCH_2.G" Source="Unregister.QO" dx1="380.0"/>
+      <Connection Comment="" Destination="E_SWITCH_2_1.G" Source="Register.QO" dx1="470.0"/>
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/Arrowhead/EventHandler/PublishEvent.dtp b/Arrowhead/Arrowhead/EventHandler/PublishEvent.dtp
new file mode 100644
index 0000000..d100a2d
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/PublishEvent.dtp
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
+<DataType Name="PublishEvent" Comment="Publish event type to be sent to the EventHandler" >
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2019-09-17" />
+  <ASN1Tag Class="APPLICATION" Number="1" />
+  <StructuredType >
+    <VarDeclaration Name="source" Type="ArrowheadSystem" Comment="ArrowheadSystem publishing the event." />
+    <VarDeclaration Name="event" Type="ArrowheadEvent" Comment="The published event." />
+    <VarDeclaration Name="deliveryCompleteUri" Type="WSTRING" Comment="The URL subpath the Event Handler can use to inform the publisher about the results of the event propagation. If null, the Event Handler will not try to send the results." />
+  </StructuredType>
+</DataType>
diff --git a/Arrowhead/Arrowhead/EventHandler/SubscribeEvent.fbt b/Arrowhead/Arrowhead/EventHandler/SubscribeEvent.fbt
new file mode 100644
index 0000000..87aec50
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/SubscribeEvent.fbt
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Subscribe Event Function Block" Name="SubscribeEvent">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-09-18" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Initialization Request" Name="Subscribe" Type="Event">
+        <With Var="eventFilter"/>
+        <With Var="endpoint"/>
+      </Event>
+      <Event Comment="Normal Execution Request" Name="Unsubscribe" Type="Event">
+        <With Var="eventFilter"/>
+        <With Var="endpoint"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Subscribe finished" Name="Subscribed" Type="Event"/>
+      <Event Comment="Unsubscribe from event" Name="Unsubscribed" Type="Event"/>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Event filter " Name="eventFilter" Type="EventFilter"/>
+      <VarDeclaration Comment="Endpoint (IP:PORT/URI) of the Service Registry (not officially in the documentation, but it simplifies the FBs)" Name="endpoint" Type="WSTRING"/>
+    </InputVars>
+    <Plugs>
+      <AdapterDeclaration Comment="Subscribe event adapter" Name="SubscribeEventAdp" Type="SubscribeEventAdp" x="3000.0" y="-100.0"/>
+    </Plugs>
+  </InterfaceList>
+  <FBNetwork>
+    <EventConnections>
+      <Connection Comment="" Destination="SubscribeEventAdp.Unsubscribe" Source="Unsubscribe" dx1="1230.0"/>
+      <Connection Comment="" Destination="SubscribeEventAdp.Subscribe" Source="Subscribe" dx1="1230.0"/>
+      <Connection Comment="" Destination="Subscribed" Source="SubscribeEventAdp.Subscribed" dx1="60.0" dx2="60.0" dy="5.0"/>
+      <Connection Comment="" Destination="Unsubscribed" Source="SubscribeEventAdp.Unsubscribed" dx1="60.0" dx2="60.0" dy="5.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="SubscribeEventAdp.eventFilter" Source="eventFilter" dx1="1230.0"/>
+      <Connection Comment="" Destination="SubscribeEventAdp.endpoint" Source="endpoint" dx1="1230.0"/>
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/Arrowhead/EventHandler/SubscribeEventAdp.adp b/Arrowhead/Arrowhead/EventHandler/SubscribeEventAdp.adp
new file mode 100644
index 0000000..0eadd7f
--- /dev/null
+++ b/Arrowhead/Arrowhead/EventHandler/SubscribeEventAdp.adp
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE AdapterType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<AdapterType Comment="Subscribe event adapter" Name="SubscribeEventAdp">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Cabral" Date="2019-09-18" Organization="fortiss GmbH" Version="1.0"/>
+  <CompilerInfo header="package fb.test;"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Subscribe finished" Name="Subscribed" Type="Event"/>
+      <Event Comment="Unsubscribe finished" Name="Unsubscribed" Type="Event"/>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Subscribe to event" Name="Subscribe" Type="Event">
+        <With Var="eventFilter"/>
+        <With Var="endpoint"/>
+      </Event>
+      <Event Comment="Unsubscribe from event" Name="Unsubscribe" Type="Event">
+        <With Var="endpoint"/>
+        <With Var="eventFilter"/>
+      </Event>
+    </EventOutputs>
+    <OutputVars>
+      <VarDeclaration Comment="Event filter " Name="eventFilter" Type="EventFilter"/>
+      <VarDeclaration Comment="Endpoint (IP:PORT/URI) of the Service Registry (not officially in the documentation, but it simplifies the FBs)" Name="endpoint" Type="WSTRING"/>
+    </OutputVars>
+  </InterfaceList>
+  <Service Comment="Subscribe event adapter" LeftInterface="SOCKET" RightInterface="PLUG">
+    <ServiceSequence Comment="" Name="request_confirm">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ" Interface="SOCKET" Parameters="REQD"/>
+        <OutputPrimitive Event="REQ" Interface="PLUG" Parameters="REQD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="CNF" Interface="PLUG" Parameters="CNFD"/>
+        <OutputPrimitive Event="CNF" Interface="SOCKET" Parameters="CNFD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="indication_response">
+      <ServiceTransaction>
+        <InputPrimitive Event="IND" Interface="PLUG" Parameters="INDD"/>
+        <OutputPrimitive Event="IND" Interface="SOCKET" Parameters="INDD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="RSP" Interface="SOCKET" Parameters="RSPD"/>
+        <OutputPrimitive Event="RSP" Interface="PLUG" Parameters="RSPD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</AdapterType>
diff --git a/Arrowhead/Arrowhead/Orchestrator/HTTP/GetEndpointFromOrchestrationHTTPPFull.sub b/Arrowhead/Arrowhead/Orchestrator/HTTP/GetEndpointFromOrchestrationHTTPPFull.sub
index 9cd3749..b9a2a22 100644
--- a/Arrowhead/Arrowhead/Orchestrator/HTTP/GetEndpointFromOrchestrationHTTPPFull.sub
+++ b/Arrowhead/Arrowhead/Orchestrator/HTTP/GetEndpointFromOrchestrationHTTPPFull.sub
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <SubAppType Comment="Get the endpoint at INDEX from a request orchestration response" Name="GetEndpointFromOrchestrationHTTPPFull">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-02-19" Organization="fortiss GmbH" Version="1.0"/>
   <SubAppInterfaceList>
     <SubAppEventInputs>
diff --git a/Arrowhead/Arrowhead/Orchestrator/HTTP/GetEndpointFromOrchestrationHTTPPartial.sub b/Arrowhead/Arrowhead/Orchestrator/HTTP/GetEndpointFromOrchestrationHTTPPartial.sub
index 326e20f..a7cbd03 100644
--- a/Arrowhead/Arrowhead/Orchestrator/HTTP/GetEndpointFromOrchestrationHTTPPartial.sub
+++ b/Arrowhead/Arrowhead/Orchestrator/HTTP/GetEndpointFromOrchestrationHTTPPartial.sub
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <SubAppType Comment="Get the endpoint at INDEX from a request orchestration response" Name="GetEndpointFromOrchestrationHTTPPartial">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-02-19" Organization="fortiss GmbH" Version="1.0"/>
   <SubAppInterfaceList>
     <SubAppEventInputs>
diff --git a/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTP.fbt b/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTP.fbt
index a643dcb..903dd24 100644
--- a/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTP.fbt
+++ b/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTP.fbt
@@ -18,7 +18,7 @@
     <FB Comment="" Name="E_PERMIT" Type="E_PERMIT" x="8065.0" y="1250.0"/>
     <FB Comment="" Name="F_STRING_TO_WSTRING" Type="F_STRING_TO_WSTRING" x="6010.0" y="1875.0"/>
     <FB Comment="" Name="ANYToJSON" Type="ANYToJSON" x="3755.0" y="1475.0"/>
-    <FB Comment="" Name="GetHTTPOrchestrationForm" Type="GetArrayResponseFromHTTP" x="-400.0" y="1500.0"/>
+    <FB Comment="" Name="GetHTTPOrchestrationForm" Type="GetArrayResponseFromJSON" x="-400.0" y="1500.0"/>
     <DataConnections>
       <Connection Comment="" Destination="F_STRING_TO_WSTRING.IN" Source="APPEND_STRING_3.OUT" dx1="155.0"/>
       <Connection Comment="" Destination="Request.ID" Source="F_STRING_TO_WSTRING.OUT" dx1="1055.0"/>
diff --git a/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTPPFull.sub b/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTPPFull.sub
index 1d35e47..e08de22 100644
--- a/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTPPFull.sub
+++ b/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTPPFull.sub
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <SubAppType Comment="Request Orchestration using HTTP with all fields from services, system and cloud to be set" Name="RequestOrchestrationHTTPPFull">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-02-19" Organization="fortiss GmbH" Version="1.0"/>
   <SubAppInterfaceList>
     <SubAppEventInputs>
diff --git a/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTPPartial.sub b/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTPPartial.sub
index e31e3e6..1201121 100644
--- a/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTPPartial.sub
+++ b/Arrowhead/Arrowhead/Orchestrator/HTTP/RequestOrchestrationHTTPPartial.sub
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <SubAppType Comment="Request Orchestration using HTTP with all fields from services to be set" Name="RequestOrchestrationHTTPPartial">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-02-19" Organization="fortiss GmbH" Version="1.0"/>
   <SubAppInterfaceList>
     <SubAppEventInputs>
diff --git a/Arrowhead/Arrowhead/Orchestrator/OpcUa/GetEndpointFromOrchestrationOpcUaFull.sub b/Arrowhead/Arrowhead/Orchestrator/OpcUa/GetEndpointFromOrchestrationOpcUaFull.sub
new file mode 100644
index 0000000..c590899
--- /dev/null
+++ b/Arrowhead/Arrowhead/Orchestrator/OpcUa/GetEndpointFromOrchestrationOpcUaFull.sub
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<SubAppType Comment="Get the endpoint at INDEX from a request orchestration response" Name="GetEndpointFromOrchestrationOpcUaFull">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <SubAppInterfaceList>
+    <SubAppEventInputs>
+      <SubAppEvent Comment="Request orchestration" Name="REQ" Type="Event"/>
+    </SubAppEventInputs>
+    <SubAppEventOutputs>
+      <SubAppEvent Comment="Request finished" Name="CNF" Type="Event"/>
+    </SubAppEventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Identification of the system" Name="systemName" Type="WSTRING"/>
+      <VarDeclaration Comment="Address of the offered services" Name="address" Type="WSTRING"/>
+      <VarDeclaration Comment="Port of the of the offered services" Name="port" Type="DINT"/>
+      <VarDeclaration Comment="Authentication info of the system" Name="authenticationInfo" Type="WSTRING"/>
+      <VarDeclaration Comment="Company (the capital  O is to avoid clash when exporting to C++)" Name="Operator" Type="WSTRING"/>
+      <VarDeclaration Comment="Identification of the cloud" Name="cloudName" Type="WSTRING"/>
+      <VarDeclaration Comment="Address to access the cloud" Name="addressCloud" Type="WSTRING"/>
+      <VarDeclaration Comment="Port to access the cloud" Name="portCloud" Type="DINT"/>
+      <VarDeclaration Comment="(Unclear documentation)" Name="gatekeeperServiceURI" Type="WSTRING"/>
+      <VarDeclaration Comment="Authentication info of the cloud" Name="authenticationInfoCloud" Type="WSTRING"/>
+      <VarDeclaration Comment="(Unclear documentation)" Name="secure" Type="BOOL"/>
+      <VarDeclaration Comment="Identification of the service" InitialValue="" Name="serviceDefinition" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Interfaces implemented by the service" InitialValue="" Name="interfaces" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Metadata of the service in key=value format" Name="serviceMetadata" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="These flags can be set to tailor the orchestration process (use just the names of the flags to be enabled)" Name="orchestrationFlags" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="There can be a list from the Consumer stating which other Application Systems (even from other Clouds) it wishes to connect. If this field is filled out, the Orchestrator will try to facilitate these preferences" Name="preferredProviders" Type="PreferredProvider"/>
+      <VarDeclaration ArraySize="10" Comment="This object will be presenting the Consumer’s selected QoS level. Not implemented" Name="requestedQoS" Type="WSTRING"/>
+      <VarDeclaration Comment="Enpoint of the orchestrator" Name="orchestratorEndpoint" Type="WSTRING"/>
+      <VarDeclaration Comment="Position in the array of the requested forms" Name="INDEX" Type="UINT"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Endpoint at position INDEX from orchestration forms" Name="endpoint" Type="WSTRING"/>
+    </OutputVars>
+  </SubAppInterfaceList>
+  <SubAppNetwork>
+    <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="7530.0" y="280.0"/>
+    <SubApp Comment="" Name="GetEndpointFromOrchestrationForm" Type="GetEndpointFromOrchestrationForm" x="8710.0" y="380.0"/>
+    <SubApp Comment="" Name="RequestOrchestrationOpcUaFull" Type="RequestOrchestrationOpcUaFull" x="3330.0" y="-260.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.REQ" Source="GET_AT_INDEX.CNF" dx1="295.0"/>
+      <Connection Comment="" Destination="CNF" Source="GetEndpointFromOrchestrationForm.CNF" dx1="60.0" dx2="60.0" dy="-230.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.REQ" Source="REQ" dx1="1240.0"/>
+      <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="RequestOrchestrationOpcUaFull.CNF" dx1="2200.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.orchestrationForm" Source="GET_AT_INDEX.OUT"/>
+      <Connection Comment="" Destination="GET_AT_INDEX.INDEX" Source="INDEX" dx1="6390.0"/>
+      <Connection Comment="" Destination="endpoint" Source="GetEndpointFromOrchestrationForm.endpoint" dx1="60.0" dx2="60.0" dy="-305.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.systemName" Source="systemName" dx1="660.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.address" Source="address" dx1="2190.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.port" Source="port" dx1="885.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.authenticationInfo" Source="authenticationInfo" dx1="990.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.Operator" Source="Operator" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.cloudName" Source="cloudName" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.addressCloud" Source="addressCloud" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.portCloud" Source="portCloud" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.gatekeeperServiceURI" Source="gatekeeperServiceURI" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.authenticationInfoCloud" Source="authenticationInfoCloud" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.secure" Source="secure" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.serviceDefinition" Source="serviceDefinition" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.interfaces" Source="interfaces" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.serviceMetadata" Source="serviceMetadata" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.orchestrationFlags" Source="orchestrationFlags" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.preferredProviders" Source="preferredProviders" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.requestedQoS" Source="requestedQoS" dx1="1240.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaFull.orchestratorEndpoint" Source="orchestratorEndpoint" dx1="1240.0"/>
+      <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="RequestOrchestrationOpcUaFull.serviceRequestForm" dx1="2200.0"/>
+    </DataConnections>
+  </SubAppNetwork>
+</SubAppType>
diff --git a/Arrowhead/Arrowhead/Orchestrator/OpcUa/GetEndpointFromOrchestrationOpcUaPartial.sub b/Arrowhead/Arrowhead/Orchestrator/OpcUa/GetEndpointFromOrchestrationOpcUaPartial.sub
new file mode 100644
index 0000000..7118e5c
--- /dev/null
+++ b/Arrowhead/Arrowhead/Orchestrator/OpcUa/GetEndpointFromOrchestrationOpcUaPartial.sub
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<SubAppType Comment="Get the endpoint at INDEX from a request orchestration response" Name="GetEndpointFromOrchestrationOpcUaPartial">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <SubAppInterfaceList>
+    <SubAppEventInputs>
+      <SubAppEvent Comment="Request orchestration" Name="REQ" Type="Event"/>
+    </SubAppEventInputs>
+    <SubAppEventOutputs>
+      <SubAppEvent Comment="Request finished" Name="CNF" Type="Event"/>
+    </SubAppEventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="The ArrowheadSystem identifier that is requesting the orchestration" Name="requesterSystem" Type="ArrowheadSystem"/>
+      <VarDeclaration Comment="Not to be used by Application Systems. This field is only used when there is an inbound request from another Cloud. This can only be submitted by the Gatekeeper" Name="requesterCloud" Type="ArrowheadCloud"/>
+      <VarDeclaration Comment="Identification of the service" InitialValue="" Name="serviceDefinition" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Interfaces implemented by the service" InitialValue="" Name="interfaces" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Metadata of the service in key=value format" Name="serviceMetadata" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="These flags can be set to tailor the orchestration process (use just the names of the flags to be enabled)" Name="orchestrationFlags" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="There can be a list from the Consumer stating which other Application Systems (even from other Clouds) it wishes to connect. If this field is filled out, the Orchestrator will try to facilitate these preferences" Name="preferredProviders" Type="PreferredProvider"/>
+      <VarDeclaration ArraySize="10" Comment="This object will be presenting the Consumer’s selected QoS level. Not implemented" Name="requestedQoS" Type="WSTRING"/>
+      <VarDeclaration Comment="Enpoint of the orchestrator" Name="orchestratorEndpoint" Type="WSTRING"/>
+      <VarDeclaration Comment="Position in the array of the requested forms" Name="INDEX" Type="UINT"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Endpoint at position INDEX from orchestration forms" Name="endpoint" Type="WSTRING"/>
+    </OutputVars>
+  </SubAppInterfaceList>
+  <SubAppNetwork>
+    <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="5255.0" y="850.0"/>
+    <SubApp Comment="" Name="GetEndpointFromOrchestrationForm" Type="GetEndpointFromOrchestrationForm" x="6445.0" y="945.0"/>
+    <SubApp Comment="" Name="RequestOrchestrationOpcUaPartial" Type="RequestOrchestrationOpcUaPartial" x="2430.0" y="-260.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.REQ" Source="GET_AT_INDEX.CNF" dx1="190.0"/>
+      <Connection Comment="" Destination="CNF" Source="GetEndpointFromOrchestrationForm.CNF" dx1="60.0" dx2="60.0" dy="-515.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.REQ" Source="REQ" dx1="840.0"/>
+      <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="RequestOrchestrationOpcUaPartial.CNF" dx1="800.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.orchestrationForm" Source="GET_AT_INDEX.OUT" dx1="190.0"/>
+      <Connection Comment="" Destination="endpoint" Source="GetEndpointFromOrchestrationForm.endpoint" dx1="60.0" dx2="60.0" dy="-590.0"/>
+      <Connection Comment="" Destination="GET_AT_INDEX.INDEX" Source="INDEX" dx1="1415.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.requesterSystem" Source="requesterSystem" dx1="840.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.requesterCloud" Source="requesterCloud" dx1="840.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.serviceDefinition" Source="serviceDefinition" dx1="840.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.interfaces" Source="interfaces" dx1="840.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.serviceMetadata" Source="serviceMetadata" dx1="840.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.orchestrationFlags" Source="orchestrationFlags" dx1="840.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.preferredProviders" Source="preferredProviders" dx1="840.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.requestedQoS" Source="requestedQoS" dx1="840.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.orchestratorEndpoint" Source="orchestratorEndpoint" dx1="840.0"/>
+      <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="RequestOrchestrationOpcUaPartial.serviceRequestForm" dx1="680.0"/>
+    </DataConnections>
+  </SubAppNetwork>
+</SubAppType>
diff --git a/Arrowhead/Arrowhead/Orchestrator/OpcUa/RequestOrchestrationOpcUa.fbt b/Arrowhead/Arrowhead/Orchestrator/OpcUa/RequestOrchestrationOpcUa.fbt
new file mode 100644
index 0000000..8ba422d
--- /dev/null
+++ b/Arrowhead/Arrowhead/Orchestrator/OpcUa/RequestOrchestrationOpcUa.fbt
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Request Orchestration Function Block using OPC UA" Name="RequestOrchestrationOpcUa">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <Sockets>
+      <AdapterDeclaration Comment="Request orchestration adapter" Name="requestOrchestration" Type="OrchestratorRequestAdp" x="1000.0" y="1500.0"/>
+    </Sockets>
+  </InterfaceList>
+  <FBNetwork>
+    <FB Comment="" Name="APPEND_STRING_3" Type="APPEND_STRING_3" x="4975.0" y="1830.0">
+      <Parameter Name="IN_1" Value="STRING#opc_ua[CALL_METHOD; "/>
+      <Parameter Name="IN_3" Value="STRING##; /Objects/2:Orchestrator/2:orchestration]"/>
+    </FB>
+    <FB Comment="" Name="InitFlag" Type="E_SR" x="7445.0" y="1665.0"/>
+    <FB Comment="" Name="E_PERMIT" Type="E_PERMIT" x="8065.0" y="1250.0"/>
+    <FB Comment="" Name="F_STRING_TO_WSTRING" Type="F_STRING_TO_WSTRING" x="6010.0" y="1875.0"/>
+    <FB Comment="" Name="ANYToJSON" Type="ANYToJSON" x="3755.0" y="1475.0"/>
+    <FB Comment="" Name="GetHTTPOrchestrationForm" Type="GetArrayResponseFromJSON" x="-400.0" y="1500.0"/>
+    <FB Comment="" Name="Request" Type="CLIENT_1" x="9240.0" y="1905.0"/>
+    <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="11100.0" y="1900.0"/>
+    <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="13000.0" y="1800.0"/>
+    <FB Comment="" Name="E_CTU" Type="E_CTU" x="12200.0" y="1800.0">
+      <Parameter Name="PV" Value="UINT#3"/>
+    </FB>
+    <FB Comment="" Name="E_DELAY" Type="E_DELAY" x="14600.0" y="1800.0">
+      <Parameter Name="DT" Value="T#250ms"/>
+    </FB>
+    <EventConnections>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.REQ" Source="APPEND_STRING_3.CNF" dx1="155.0"/>
+      <Connection Comment="" Destination="InitFlag.S" Source="F_STRING_TO_WSTRING.CNF" dx1="305.0"/>
+      <Connection Comment="" Destination="APPEND_STRING_3.REQ" Source="ANYToJSON.CNF" dx1="245.0"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="requestOrchestration.requestOrchestator" dx1="840.0"/>
+      <Connection Comment="" Destination="requestOrchestration.responseReceived" Source="GetHTTPOrchestrationForm.CNF"/>
+      <Connection Comment="" Destination="Request.INIT" Source="InitFlag.EO" dx1="620.0"/>
+      <Connection Comment="" Destination="Request.REQ" Source="E_PERMIT.EO" dx1="240.0"/>
+      <Connection Comment="" Destination="E_PERMIT.EI" Source="Request.INITO" dx1="60.0" dx2="60.0" dy="-1150.0"/>
+      <Connection Comment="" Destination="GetHTTPOrchestrationForm.REQ" Source="E_SWITCH.EO1" dx1="445.0" dx2="60.0" dy="-1945.0"/>
+      <Connection Comment="" Destination="InitFlag.R" Source="E_SWITCH.EO1" dx1="240.0" dx2="60.0" dy="-1605.0"/>
+      <Connection Comment="" Destination="E_SWITCH.EI" Source="Request.CNF" dx1="655.0"/>
+      <Connection Comment="" Destination="E_CTU.CU" Source="E_SWITCH.EO0" dx1="310.0"/>
+      <Connection Comment="" Destination="Request.REQ" Source="E_DELAY.EO" dx1="60.0" dx2="60.0" dy="-685.0"/>
+      <Connection Comment="" Destination="E_SWITCH_1.EI" Source="E_CTU.CUO"/>
+      <Connection Comment="" Destination="E_DELAY.START" Source="E_SWITCH_1.EO0"/>
+      <Connection Comment="" Destination="InitFlag.R" Source="E_SWITCH_1.EO1" dx1="60.0" dx2="60.0" dy="1490.0"/>
+      <Connection Comment="" Destination="GetHTTPOrchestrationForm.REQ" Source="E_SWITCH_1.EO1" dx1="305.0" dx2="205.0" dy="1875.0"/>
+      <Connection Comment="" Destination="E_CTU.R" Source="E_SWITCH.EO1" dx1="310.0"/>
+      <Connection Comment="" Destination="E_CTU.R" Source="E_SWITCH_1.EO1" dx1="60.0" dx2="60.0" dy="120.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.IN" Source="APPEND_STRING_3.OUT" dx1="155.0"/>
+      <Connection Comment="" Destination="E_PERMIT.PERMIT" Source="InitFlag.Q" dx1="170.0"/>
+      <Connection Comment="" Destination="ANYToJSON.input" Source="requestOrchestration.serviceRequestForm" dx1="840.0"/>
+      <Connection Comment="" Destination="APPEND_STRING_3.IN_2" Source="requestOrchestration.endpoint" dx1="615.0"/>
+      <Connection Comment="" Destination="requestOrchestration.orchestrationResponse" Source="GetHTTPOrchestrationForm.output"/>
+      <Connection Comment="" Destination="Request.QI" Source="InitFlag.Q" dx1="740.0"/>
+      <Connection Comment="" Destination="Request.ID" Source="F_STRING_TO_WSTRING.OUT" dx1="1055.0"/>
+      <Connection Comment="" Destination="Request.SD_1" Source="ANYToJSON.output" dx1="325.0"/>
+      <Connection Comment="" Destination="GetHTTPOrchestrationForm.response" Source="Request.RD_1" dx1="60.0" dx2="60.0" dy="310.0"/>
+      <Connection Comment="" Destination="E_SWITCH.G" Source="Request.QO" dx1="655.0"/>
+      <Connection Comment="" Destination="E_SWITCH_1.G" Source="E_CTU.Q"/>
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/Arrowhead/Orchestrator/OpcUa/RequestOrchestrationOpcUaFull.sub b/Arrowhead/Arrowhead/Orchestrator/OpcUa/RequestOrchestrationOpcUaFull.sub
new file mode 100644
index 0000000..c0c23c9
--- /dev/null
+++ b/Arrowhead/Arrowhead/Orchestrator/OpcUa/RequestOrchestrationOpcUaFull.sub
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<SubAppType Comment="Request Orchestration using OPC UA with all fields from services, system and cloud to be set" Name="RequestOrchestrationOpcUaFull">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <SubAppInterfaceList>
+    <SubAppEventInputs>
+      <SubAppEvent Comment="Request orchestration" Name="REQ" Type="Event"/>
+    </SubAppEventInputs>
+    <SubAppEventOutputs>
+      <SubAppEvent Comment="Request finished" Name="CNF" Type="Event"/>
+    </SubAppEventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Identification of the system" Name="systemName" Type="WSTRING"/>
+      <VarDeclaration Comment="Address of the offered services" Name="address" Type="WSTRING"/>
+      <VarDeclaration Comment="Port of the of the offered services" Name="port" Type="DINT"/>
+      <VarDeclaration Comment="Authentication info of the system" Name="authenticationInfo" Type="WSTRING"/>
+      <VarDeclaration Comment="Company (the capital  O is to avoid clash when exporting to C++)" Name="Operator" Type="WSTRING"/>
+      <VarDeclaration Comment="Identification of the cloud" Name="cloudName" Type="WSTRING"/>
+      <VarDeclaration Comment="Address to access the cloud" Name="addressCloud" Type="WSTRING"/>
+      <VarDeclaration Comment="Port to access the cloud" Name="portCloud" Type="DINT"/>
+      <VarDeclaration Comment="(Unclear documentation)" Name="gatekeeperServiceURI" Type="WSTRING"/>
+      <VarDeclaration Comment="Authentication info of the cloud" Name="authenticationInfoCloud" Type="WSTRING"/>
+      <VarDeclaration Comment="(Unclear documentation)" Name="secure" Type="BOOL"/>
+      <VarDeclaration Comment="Identification of the service" InitialValue="" Name="serviceDefinition" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Interfaces implemented by the service" InitialValue="" Name="interfaces" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Metadata of the service in key=value format" Name="serviceMetadata" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="These flags can be set to tailor the orchestration process (use just the names of the flags to be enabled)" Name="orchestrationFlags" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="There can be a list from the Consumer stating which other Application Systems (even from other Clouds) it wishes to connect. If this field is filled out, the Orchestrator will try to facilitate these preferences" Name="preferredProviders" Type="PreferredProvider"/>
+      <VarDeclaration ArraySize="10" Comment="This object will be presenting the Consumer’s selected QoS level. Not implemented" Name="requestedQoS" Type="WSTRING"/>
+      <VarDeclaration Comment="Enpoint of the orchestrator" Name="orchestratorEndpoint" Type="WSTRING"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration ArraySize="10" Comment="Response from the orchestrator" Name="serviceRequestForm" Type="OrchestrationForm"/>
+    </OutputVars>
+  </SubAppInterfaceList>
+  <SubAppNetwork>
+    <FB Comment="" Name="FieldsToArrowheadCloud" Type="FieldsToArrowheadCloud" x="2785.0" y="145.0"/>
+    <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="2825.0" y="-695.0"/>
+    <SubApp Comment="" Name="RequestOrchestrationOpcUaPartial" Type="RequestOrchestrationOpcUaPartial" x="6700.0" y="735.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="REQ" dx1="465.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadCloud.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="660.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.REQ" Source="FieldsToArrowheadCloud.CNF" dx1="1270.0"/>
+      <Connection Comment="" Destination="CNF" Source="RequestOrchestrationOpcUaPartial.CNF" dx1="60.0" dx2="60.0" dy="-410.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.systemName" Source="systemName" dx1="660.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadCloud.Operator" Source="Operator" dx1="1250.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.address" Source="address" dx1="720.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.port" Source="port" dx1="885.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.authenticationInfo" Source="authenticationInfo" dx1="990.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadCloud.cloudName" Source="cloudName" dx1="950.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadCloud.address" Source="addressCloud" dx1="950.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadCloud.port" Source="portCloud" dx1="950.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadCloud.gatekeeperServiceURI" Source="gatekeeperServiceURI" dx1="950.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadCloud.authenticationInfo" Source="authenticationInfoCloud" dx1="950.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadCloud.secure" Source="secure" dx1="950.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.requesterSystem" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1525.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.requesterCloud" Source="FieldsToArrowheadCloud.arrowheadCloud" dx1="1245.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.serviceDefinition" Source="serviceDefinition" dx1="2925.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.interfaces" Source="interfaces" dx1="2925.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.serviceMetadata" Source="serviceMetadata" dx1="2925.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.orchestrationFlags" Source="orchestrationFlags" dx1="2925.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.preferredProviders" Source="preferredProviders" dx1="2925.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.requestedQoS" Source="requestedQoS" dx1="2925.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUaPartial.orchestratorEndpoint" Source="orchestratorEndpoint" dx1="2925.0"/>
+      <Connection Comment="" Destination="serviceRequestForm" Source="RequestOrchestrationOpcUaPartial.serviceRequestForm" dx1="60.0" dx2="60.0" dy="-485.0"/>
+    </DataConnections>
+  </SubAppNetwork>
+</SubAppType>
diff --git a/Arrowhead/Arrowhead/Orchestrator/OpcUa/RequestOrchestrationOpcUaPartial.sub b/Arrowhead/Arrowhead/Orchestrator/OpcUa/RequestOrchestrationOpcUaPartial.sub
new file mode 100644
index 0000000..709bef4
--- /dev/null
+++ b/Arrowhead/Arrowhead/Orchestrator/OpcUa/RequestOrchestrationOpcUaPartial.sub
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<SubAppType Comment="Request Orchestration using OPC UA with all fields from services to be set" Name="RequestOrchestrationOpcUaPartial">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <SubAppInterfaceList>
+    <SubAppEventInputs>
+      <SubAppEvent Comment="Request orchestration" Name="REQ" Type="Event"/>
+    </SubAppEventInputs>
+    <SubAppEventOutputs>
+      <SubAppEvent Comment="Request finished" Name="CNF" Type="Event"/>
+    </SubAppEventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="The ArrowheadSystem identifier that is requesting the orchestration" Name="requesterSystem" Type="ArrowheadSystem"/>
+      <VarDeclaration Comment="Not to be used by Application Systems. This field is only used when there is an inbound request from another Cloud. This can only be submitted by the Gatekeeper" Name="requesterCloud" Type="ArrowheadCloud"/>
+      <VarDeclaration Comment="Identification of the service" InitialValue="" Name="serviceDefinition" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Interfaces implemented by the service" InitialValue="" Name="interfaces" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Metadata of the service in key=value format" Name="serviceMetadata" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="These flags can be set to tailor the orchestration process (use just the names of the flags to be enabled)" Name="orchestrationFlags" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="There can be a list from the Consumer stating which other Application Systems (even from other Clouds) it wishes to connect. If this field is filled out, the Orchestrator will try to facilitate these preferences" Name="preferredProviders" Type="PreferredProvider"/>
+      <VarDeclaration ArraySize="10" Comment="This object will be presenting the Consumer’s selected QoS level. Not implemented" Name="requestedQoS" Type="WSTRING"/>
+      <VarDeclaration Comment="Enpoint of the orchestrator" Name="orchestratorEndpoint" Type="WSTRING"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration ArraySize="10" Comment="Response from the orchestrator" Name="serviceRequestForm" Type="OrchestrationForm"/>
+    </OutputVars>
+  </SubAppInterfaceList>
+  <SubAppNetwork>
+    <FB Comment="" Name="FieldsToServiceRequestForm" Type="FieldsToServiceRequestForm" x="3805.0" y="-85.0"/>
+    <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="1510.0" y="1475.0"/>
+    <FB Comment="" Name="RequestOrchestrationForm" Type="RequestOrchestrationForm" x="6135.0" y="1900.0"/>
+    <FB Comment="" Name="RequestOrchestrationOpcUa" Type="RequestOrchestrationOpcUa" x="8520.0" y="2400.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="REQ" dx1="465.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRequestForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="355.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="FieldsToServiceRequestForm.CNF" dx1="555.0"/>
+      <Connection Comment="" Destination="CNF" Source="RequestOrchestrationForm.responseReceived" dx1="60.0" dx2="60.0" dy="-990.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="FieldsToServiceRequestForm.requesterSystem" Source="requesterSystem" dx1="1670.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRequestForm.requesterCloud" Source="requesterCloud" dx1="1500.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRequestForm.requestedService" Source="FieldsToArrowheadService.arrowheadService" dx1="550.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.serviceDefinition" Source="serviceDefinition" dx1="400.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.interfaces" Source="interfaces" dx1="335.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.serviceMetadata" Source="serviceMetadata" dx1="260.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRequestForm.orchestrationFlags" Source="orchestrationFlags" dx1="1500.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRequestForm.preferredProviders" Source="preferredProviders" dx1="1500.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRequestForm.requestedQoS" Source="requestedQoS" dx1="1500.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationForm.serviceRequestForm" Source="FieldsToServiceRequestForm.serviceRequestForm" dx1="505.0"/>
+      <Connection Comment="" Destination="serviceRequestForm" Source="RequestOrchestrationForm.orchestrationResponse" dx1="60.0" dx2="60.0" dy="-1065.0"/>
+      <Connection Comment="" Destination="RequestOrchestrationForm.endpoint" Source="orchestratorEndpoint" dx1="2695.0"/>
+    </DataConnections>
+    <AdapterConnections>
+      <Connection Comment="" Destination="RequestOrchestrationOpcUa.requestOrchestration" Source="RequestOrchestrationForm.requestOrchestration" dx1="435.0"/>
+    </AdapterConnections>
+  </SubAppNetwork>
+</SubAppType>
diff --git a/Arrowhead/Arrowhead/Orchestrator/OrchestrationForm.dtp b/Arrowhead/Arrowhead/Orchestrator/OrchestrationForm.dtp
index 6fa4b7b..57f68e9 100644
--- a/Arrowhead/Arrowhead/Orchestrator/OrchestrationForm.dtp
+++ b/Arrowhead/Arrowhead/Orchestrator/OrchestrationForm.dtp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
 <DataType Name="OrchestrationForm" Comment="Reponse sent by the orchestrator" >
-  <Identification Standard="61499-2" />
+  <Identification Description="Copyright (c) 2018 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2018-09-26" />
   <ASN1Tag Class="APPLICATION" Number="1" />
   <StructuredType >
diff --git a/Arrowhead/Arrowhead/Orchestrator/OrchestrationForm2OrchestrationForm.fbt b/Arrowhead/Arrowhead/Orchestrator/OrchestrationForm2OrchestrationForm.fbt
index d94cc74..8bd102c 100644
--- a/Arrowhead/Arrowhead/Orchestrator/OrchestrationForm2OrchestrationForm.fbt
+++ b/Arrowhead/Arrowhead/Orchestrator/OrchestrationForm2OrchestrationForm.fbt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <FBType Comment="Helper FB to set the connection to a Orchestration Form type" Name="OrchestrationForm2OrchestrationForm">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-01-28" Organization="fortiss GmbH" Version="1.0"/>
   <InterfaceList>
     <EventInputs>
diff --git a/Arrowhead/Arrowhead/Orchestrator/PreferredProvider.dtp b/Arrowhead/Arrowhead/Orchestrator/PreferredProvider.dtp
index 12c7f7e..96a2800 100644
--- a/Arrowhead/Arrowhead/Orchestrator/PreferredProvider.dtp
+++ b/Arrowhead/Arrowhead/Orchestrator/PreferredProvider.dtp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
 <DataType Name="PreferredProvider" Comment="" >
-  <Identification Standard="61499-2" />
+  <Identification Description="Copyright (c) 2018 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2018-09-26" />
   <ASN1Tag Class="APPLICATION" Number="1" />
   <StructuredType >
diff --git a/Arrowhead/Arrowhead/Orchestrator/ServiceRequestForm.dtp b/Arrowhead/Arrowhead/Orchestrator/ServiceRequestForm.dtp
index 603af8b..3b17086 100644
--- a/Arrowhead/Arrowhead/Orchestrator/ServiceRequestForm.dtp
+++ b/Arrowhead/Arrowhead/Orchestrator/ServiceRequestForm.dtp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
 <DataType Name="ServiceRequestForm" Comment="A service request form to be sent to the ochestrator" >
-  <Identification Standard="61499-2" />
+  <Identification Description="Copyright (c) 2018 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2018-09-26" />
   <ASN1Tag Class="APPLICATION" Number="1" />
   <StructuredType >
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTP.fbt b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTP.fbt
index 26436e1..fa8b534 100644
--- a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTP.fbt
+++ b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTP.fbt
@@ -18,7 +18,7 @@
     <FB Comment="" Name="InitFlag" Type="E_SR" x="6975.0" y="1685.0"/>
     <FB Comment="" Name="E_PERMIT" Type="E_PERMIT" x="7840.0" y="810.0"/>
     <FB Comment="" Name="ANYToJSON" Type="ANYToJSON" x="3460.0" y="1395.0"/>
-    <FB Comment="" Name="GetHTTPResult" Type="GetArrayResponseFromHTTP" x="500.0" y="1400.0"/>
+    <FB Comment="" Name="GetHTTPResult" Type="GetArrayResponseFromJSON" x="500.0" y="1400.0"/>
     <DataConnections>
       <Connection Comment="" Destination="F_STRING_TO_WSTRING.IN" Source="APPEND_STRING_3.OUT" dx1="285.0"/>
       <Connection Comment="" Destination="Query.ID" Source="F_STRING_TO_WSTRING.OUT" dx1="840.0"/>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTPSub.SUB b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTPSub.SUB
index bcdbed6..1885ab2 100644
--- a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTPSub.SUB
+++ b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTPSub.SUB
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <SubAppType Comment="Query services using HTTP with the service defined" Name="QueryServiceHTTPSub">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-02-05" Organization="fortiss GmbH" Version="1.0"/>
   <SubAppInterfaceList>
     <SubAppEventInputs>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTPSubFull.SUB b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTPSubFull.SUB
index 9543e4a..9365130 100644
--- a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTPSubFull.SUB
+++ b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/QueryServiceHTTPSubFull.SUB
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <SubAppType Comment="Query services using HTTP with all service's fields to be defined" Name="QueryServiceHTTPSubFull">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-02-05" Organization="fortiss GmbH" Version="1.0"/>
   <SubAppInterfaceList>
     <SubAppEventInputs>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterMultipleServicesHTTP.SUB b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterMultipleServicesHTTP.SUB
index f6c3d8b..25fd800 100644
--- a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterMultipleServicesHTTP.SUB
+++ b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterMultipleServicesHTTP.SUB
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <SubAppType Comment="Register many services with different serviceDefinition and serviceURI " Name="RegisterMultipleServicesHTTP">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-02-08" Organization="fortiss GmbH" Version="1.0"/>
   <SubAppInterfaceList>
     <SubAppEventInputs>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterServiceFullHTTP.SUB b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterServiceFullHTTP.SUB
index 86708fc..c259a7c 100644
--- a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterServiceFullHTTP.SUB
+++ b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterServiceFullHTTP.SUB
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <SubAppType Comment="Register a Service using HTTP. All possible parameters are available to be set" Name="RegisterServiceFullHTTP">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-01-31" Organization="fortiss GmbH" Version="1.0"/>
   <SubAppInterfaceList>
     <SubAppEventInputs>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterServicePartialHTTP.SUB b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterServicePartialHTTP.SUB
index fafcc4f..27c6f40 100644
--- a/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterServicePartialHTTP.SUB
+++ b/Arrowhead/Arrowhead/ServiceRegistry/HTTP/RegisterServicePartialHTTP.SUB
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <SubAppType Comment="Register a Service using HTTP. The system information is encapsulated" Name="RegisterServicePartialHTTP">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-01-31" Organization="fortiss GmbH" Version="1.0"/>
   <SubAppInterfaceList>
     <SubAppEventInputs>
@@ -30,6 +30,21 @@
     <FB Comment="" Name="E_SR" Type="E_SR" x="6365.0" y="-135.0"/>
     <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="7880.0" y="415.0"/>
     <FB Comment="" Name="E_REND" Type="E_REND" x="7210.0" y="270.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="doneRegister" Source="RegisterService.doneRegister" dx1="1570.0"/>
+      <Connection Comment="" Destination="doneUnregister" Source="RegisterService.doneUnregister" dx1="1570.0"/>
+      <Connection Comment="" Destination="RegisterService.register" Source="E_SWITCH.EO1" dx1="80.0"/>
+      <Connection Comment="" Destination="RegisterService.unregister" Source="E_SWITCH.EO0" dx1="225.0"/>
+      <Connection Comment="" Destination="E_SR.S" Source="register" dx1="2855.0"/>
+      <Connection Comment="" Destination="E_SR.R" Source="unregister" dx1="2855.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="register" dx1="2420.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="unregister" dx1="2420.0"/>
+      <Connection Comment="" Destination="E_REND.EI1" Source="register" dx1="3315.0"/>
+      <Connection Comment="" Destination="E_REND.EI1" Source="unregister" dx1="3315.0"/>
+      <Connection Comment="" Destination="E_REND.EI2" Source="FieldsToServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="-505.0"/>
+      <Connection Comment="" Destination="E_SWITCH.EI" Source="E_REND.EO" dx1="150.0"/>
+      <Connection Comment="" Destination="E_REND.R" Source="E_REND.EO" dx1="85.0" dx2="175.0" dy="-370.0"/>
+    </EventConnections>
     <DataConnections>
       <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="665.0"/>
       <Connection Comment="" Destination="FieldsToServiceRegistryEntry.serviceURI" Source="serviceURI" dx1="615.0"/>
@@ -42,23 +57,8 @@
       <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="provider" dx1="3285.0"/>
       <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="providedService" dx1="2420.0"/>
     </DataConnections>
-    <EventConnections>
-      <Connection Comment="" Destination="doneRegister" Source="RegisterService.doneRegister" dx1="1065.0"/>
-      <Connection Comment="" Destination="doneUnregister" Source="RegisterService.doneUnregister" dx1="1065.0"/>
-      <Connection Comment="" Destination="RegisterService.register" Source="E_SWITCH.EO1" dx1="80.0"/>
-      <Connection Comment="" Destination="RegisterService.unregister" Source="E_SWITCH.EO0" dx1="255.0"/>
-      <Connection Comment="" Destination="E_SR.S" Source="register" dx1="2855.0"/>
-      <Connection Comment="" Destination="E_SR.R" Source="unregister" dx1="2855.0"/>
-      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="register" dx1="2420.0"/>
-      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="unregister" dx1="2420.0"/>
-      <Connection Comment="" Destination="E_REND.EI1" Source="register" dx1="3315.0"/>
-      <Connection Comment="" Destination="E_REND.EI1" Source="unregister" dx1="3315.0"/>
-      <Connection Comment="" Destination="E_REND.EI2" Source="FieldsToServiceRegistryEntry.CNF" dx1="355.0"/>
-      <Connection Comment="" Destination="E_SWITCH.EI" Source="E_REND.EO" dx1="150.0"/>
-      <Connection Comment="" Destination="E_REND.R" Source="E_REND.EO" dx1="85.0" dx2="175.0" dy="-370.0"/>
-    </EventConnections>
     <AdapterConnections>
-      <Connection Comment="" Destination="RegisterServiceHTTP_1.registerService" Source="RegisterService.registerService" dx1="240.0"/>
+      <Connection Comment="" Destination="RegisterServiceHTTP_1.registerService" Source="RegisterService.registerService" dx1="95.0"/>
     </AdapterConnections>
   </SubAppNetwork>
 </SubAppType>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/QueryServiceOpcUa.fbt b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/QueryServiceOpcUa.fbt
new file mode 100644
index 0000000..e9cf64b
--- /dev/null
+++ b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/QueryServiceOpcUa.fbt
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Query for Services using OPC UA" Name="QueryServiceOpcUa">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <Sockets>
+      <AdapterDeclaration Comment="" Name="queryServices" Type="QueryServicesAdp" x="2000.0" y="1400.0"/>
+    </Sockets>
+  </InterfaceList>
+  <FBNetwork>
+    <FB Comment="" Name="APPEND_STRING_3" Type="APPEND_STRING_3" x="4860.0" y="2090.0">
+      <Parameter Name="IN_1" Value="STRING#opc_ua[CALL_METHOD; "/>
+      <Parameter Name="IN_3" Value="STRING##; /Objects/2:ServiceRegistry/2:query]"/>
+    </FB>
+    <FB Comment="" Name="F_STRING_TO_WSTRING" Type="F_STRING_TO_WSTRING" x="6155.0" y="2075.0"/>
+    <FB Comment="" Name="InitFlag" Type="E_SR" x="7435.0" y="1675.0"/>
+    <FB Comment="" Name="E_PERMIT" Type="E_PERMIT" x="8300.0" y="800.0"/>
+    <FB Comment="" Name="ANYToJSON" Type="ANYToJSON" x="3900.0" y="1400.0"/>
+    <FB Comment="" Name="GetHTTPResult" Type="GetArrayResponseFromJSON" x="500.0" y="1400.0"/>
+    <FB Comment="" Name="Query" Type="CLIENT_1" x="9060.0" y="1660.0"/>
+    <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="12400.0" y="1500.0"/>
+    <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="10500.0" y="1600.0"/>
+    <FB Comment="" Name="E_DELAY" Type="E_DELAY" x="14000.0" y="1500.0">
+      <Parameter Name="DT" Value="T#250ms"/>
+    </FB>
+    <FB Comment="" Name="E_CTU" Type="E_CTU" x="11600.0" y="1500.0">
+      <Parameter Name="PV" Value="UINT#3"/>
+    </FB>
+    <EventConnections>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.REQ" Source="APPEND_STRING_3.CNF" dx1="285.0"/>
+      <Connection Comment="" Destination="InitFlag.S" Source="F_STRING_TO_WSTRING.CNF" dx1="190.0"/>
+      <Connection Comment="" Destination="APPEND_STRING_3.REQ" Source="ANYToJSON.CNF" dx1="185.0"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="queryServices.query"/>
+      <Connection Comment="" Destination="queryServices.queried" Source="GetHTTPResult.CNF"/>
+      <Connection Comment="" Destination="Query.INIT" Source="InitFlag.EO" dx1="295.0"/>
+      <Connection Comment="" Destination="Query.REQ" Source="E_PERMIT.EO" dx1="220.0"/>
+      <Connection Comment="" Destination="E_PERMIT.EI" Source="Query.INITO" dx1="60.0" dx2="60.0" dy="-1290.0"/>
+      <Connection Comment="" Destination="E_DELAY.START" Source="E_SWITCH_1.EO0"/>
+      <Connection Comment="" Destination="E_SWITCH_1.EI" Source="E_CTU.CUO"/>
+      <Connection Comment="" Destination="E_CTU.CU" Source="E_SWITCH.EO0" dx1="310.0"/>
+      <Connection Comment="" Destination="GetHTTPResult.REQ" Source="E_SWITCH.EO1" dx1="405.0" dx2="60.0" dy="-1900.0"/>
+      <Connection Comment="" Destination="InitFlag.R" Source="E_SWITCH.EO1" dx1="260.0" dx2="150.0" dy="-1650.0"/>
+      <Connection Comment="" Destination="E_SWITCH.EI" Source="Query.CNF" dx1="445.0"/>
+      <Connection Comment="" Destination="InitFlag.R" Source="E_SWITCH_1.EO1" dx1="60.0" dx2="60.0" dy="1350.0"/>
+      <Connection Comment="" Destination="GetHTTPResult.REQ" Source="E_SWITCH_1.EO1" dx1="60.0" dx2="360.0" dy="-2170.0"/>
+      <Connection Comment="" Destination="Query.REQ" Source="E_DELAY.EO" dx1="60.0" dx2="230.0" dy="-210.0"/>
+      <Connection Comment="" Destination="E_CTU.R" Source="E_SWITCH.EO1" dx1="310.0"/>
+      <Connection Comment="" Destination="E_CTU.R" Source="E_SWITCH_1.EO1" dx1="60.0" dx2="60.0" dy="120.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.IN" Source="APPEND_STRING_3.OUT" dx1="285.0"/>
+      <Connection Comment="" Destination="E_PERMIT.PERMIT" Source="InitFlag.Q" dx1="205.0"/>
+      <Connection Comment="" Destination="ANYToJSON.input" Source="queryServices.serviceQueryForm"/>
+      <Connection Comment="" Destination="APPEND_STRING_3.IN_2" Source="queryServices.endpoint" dx1="325.0"/>
+      <Connection Comment="" Destination="queryServices.serviceEntries" Source="GetHTTPResult.output"/>
+      <Connection Comment="" Destination="Query.QI" Source="InitFlag.Q" dx1="370.0"/>
+      <Connection Comment="" Destination="Query.ID" Source="F_STRING_TO_WSTRING.OUT" dx1="840.0"/>
+      <Connection Comment="" Destination="Query.SD_1" Source="ANYToJSON.output" dx1="4045.0"/>
+      <Connection Comment="" Destination="GetHTTPResult.response" Source="Query.RD_1" dx1="60.0" dx2="60.0" dy="460.0"/>
+      <Connection Comment="" Destination="E_SWITCH_1.G" Source="E_CTU.Q"/>
+      <Connection Comment="" Destination="E_SWITCH.G" Source="Query.QO" dx1="445.0"/>
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/QueryServiceOpcUaSub.SUB b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/QueryServiceOpcUaSub.SUB
new file mode 100644
index 0000000..814574c
--- /dev/null
+++ b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/QueryServiceOpcUaSub.SUB
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<SubAppType Comment="Query services using OPC UA with the service defined" Name="QueryServiceOpcUaSub">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <SubAppInterfaceList>
+    <SubAppEventInputs>
+      <SubAppEvent Comment="Query for services" Name="REQ" Type="Event"/>
+    </SubAppEventInputs>
+    <SubAppEventOutputs>
+      <SubAppEvent Comment="Query finished" Name="CNF" Type="Event"/>
+    </SubAppEventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="The Arrowhead Service object that is looked for (SD and supported IDD-s)" Name="service" Type="ArrowheadService"/>
+      <VarDeclaration Comment="True, if service metadata shall be taken into account during query" Name="metadaSearch" Type="BOOL"/>
+      <VarDeclaration Comment="True, if the selected (query fitting) Application Systems shall be pinged to see if they’re alive" Name="pingProviders" Type="BOOL"/>
+      <VarDeclaration Comment="The minimum version of the Service we are looking for" Name="version" Type="DINT"/>
+      <VarDeclaration Comment="Address of the Service Registry (not officially in the documentation, but it simplifies the FBs)" Name="address" Type="WSTRING"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration ArraySize="10" Comment="" Name="serviceEntries" Type="ServiceRegistryEntry"/>
+    </OutputVars>
+  </SubAppInterfaceList>
+  <SubAppNetwork>
+    <FB Comment="" Name="FieldsToServiceQueryForm" Type="FieldsToServiceQueryForm" x="2400.0" y="-165.0"/>
+    <FB Comment="" Name="QueryService" Type="QueryService" x="4920.0" y="155.0"/>
+    <FB Comment="" Name="QueryServiceOpcUa" Type="QueryServiceOpcUa" x="6540.0" y="865.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="QueryService.query" Source="FieldsToServiceQueryForm.CNF" dx1="655.0"/>
+      <Connection Comment="" Destination="CNF" Source="QueryService.queried" dx1="60.0" dx2="60.0" dy="-120.0"/>
+      <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="REQ" dx1="945.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="470.0"/>
+      <Connection Comment="" Destination="serviceEntries" Source="QueryService.serviceEntries" dx1="60.0" dx2="60.0" dy="-195.0"/>
+      <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="service" dx1="750.0"/>
+      <Connection Comment="" Destination="FieldsToServiceQueryForm.metadataSearch" Source="metadaSearch" dx1="525.0"/>
+      <Connection Comment="" Destination="FieldsToServiceQueryForm.pingProviders" Source="pingProviders" dx1="390.0"/>
+      <Connection Comment="" Destination="FieldsToServiceQueryForm.version" Source="version" dx1="210.0"/>
+      <Connection Comment="" Destination="QueryService.address" Source="address" dx1="100.0"/>
+    </DataConnections>
+    <AdapterConnections>
+      <Connection Comment="" Destination="QueryServiceOpcUa.queryServices" Source="QueryService.queryServices" dx1="100.0"/>
+    </AdapterConnections>
+  </SubAppNetwork>
+</SubAppType>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/QueryServiceOpcUaSubFull.SUB b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/QueryServiceOpcUaSubFull.SUB
new file mode 100644
index 0000000..1d7b0f4
--- /dev/null
+++ b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/QueryServiceOpcUaSubFull.SUB
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<SubAppType Comment="Query services using OPC UA with all service's fields to be defined" Name="QueryServiceOpcUaSubFull">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <SubAppInterfaceList>
+    <SubAppEventInputs>
+      <SubAppEvent Comment="Query for services" Name="REQ" Type="Event"/>
+    </SubAppEventInputs>
+    <SubAppEventOutputs>
+      <SubAppEvent Comment="Query finished" Name="CNF" Type="Event"/>
+    </SubAppEventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Interfaces implemented by the service" Name="serviceDefinition" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Interfaces implemented by the service" Name="interfaces" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Metadata of the service in key=value format" Name="serviceMetadata" Type="WSTRING"/>
+      <VarDeclaration Comment="True, if service metadata shall be taken into account during query" Name="metadaSearch" Type="BOOL"/>
+      <VarDeclaration Comment="True, if the selected (query fitting) Application Systems shall be pinged to see if they’re alive" Name="pingProviders" Type="BOOL"/>
+      <VarDeclaration Comment="The minimum version of the Service we are looking for" Name="version" Type="DINT"/>
+      <VarDeclaration Comment="Address of the Service Registry" Name="address" Type="WSTRING"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration ArraySize="10" Comment="" Name="serviceEntries" Type="ServiceRegistryEntry"/>
+    </OutputVars>
+  </SubAppInterfaceList>
+  <SubAppNetwork>
+    <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="1395.0" y="-245.0"/>
+    <SubApp Comment="" Name="QueryServiceOpcUaSub" Type="QueryServiceOpcUaSub" x="3705.0" y="-25.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="REQ" dx1="385.0"/>
+      <Connection Comment="" Destination="QueryServiceOpcUaSub.REQ" Source="FieldsToArrowheadService.CNF" dx1="570.0"/>
+      <Connection Comment="" Destination="CNF" Source="QueryServiceOpcUaSub.CNF" dx1="60.0" dx2="60.0" dy="-30.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="FieldsToArrowheadService.interfaces" Source="interfaces" dx1="290.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.serviceDefinition" Source="serviceDefinition" dx1="290.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.serviceMetadata" Source="serviceMetadata" dx1="290.0"/>
+      <Connection Comment="" Destination="QueryServiceOpcUaSub.service" Source="FieldsToArrowheadService.arrowheadService" dx1="480.0"/>
+      <Connection Comment="" Destination="QueryServiceOpcUaSub.metadaSearch" Source="metadaSearch" dx1="1500.0"/>
+      <Connection Comment="" Destination="QueryServiceOpcUaSub.pingProviders" Source="pingProviders" dx1="1500.0"/>
+      <Connection Comment="" Destination="QueryServiceOpcUaSub.version" Source="version" dx1="1500.0"/>
+      <Connection Comment="" Destination="QueryServiceOpcUaSub.address" Source="address" dx1="1500.0"/>
+      <Connection Comment="" Destination="serviceEntries" Source="QueryServiceOpcUaSub.serviceEntries" dx1="60.0" dx2="60.0" dy="-105.0"/>
+    </DataConnections>
+  </SubAppNetwork>
+</SubAppType>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterMultipleServicesOpcUa.SUB b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterMultipleServicesOpcUa.SUB
new file mode 100644
index 0000000..ee75499
--- /dev/null
+++ b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterMultipleServicesOpcUa.SUB
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<SubAppType Comment="Register many services with different serviceDefinition and serviceURI " Name="RegisterMultipleServicesOpcUa">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <SubAppInterfaceList>
+    <SubAppEventInputs>
+      <SubAppEvent Comment="Register the services" Name="register" Type="Event"/>
+      <SubAppEvent Comment="Unregister the services" Name="unregister" Type="Event"/>
+    </SubAppEventInputs>
+    <SubAppEventOutputs>
+      <SubAppEvent Comment="Services registered" Name="registerDone" Type="Event"/>
+      <SubAppEvent Comment="Services unregistered" Name="unregisterUndone" Type="Event"/>
+    </SubAppEventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="ArrowheadSystem that is providing the Service" Name="provider" Type="ArrowheadSystem"/>
+      <VarDeclaration ArraySize="10" Comment="Identifications of the services" Name="serviceDefinition" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Interfaces implemented by the service" Name="interfaces" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Metadata of the service in key=value format" Name="serviceMetadata" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="The URL subpaths of the Services within the address:port of the Provider" Name="serviceURI" Type="WSTRING"/>
+      <VarDeclaration Comment="The version numbering of the Service provided" Name="version" Type="DINT"/>
+      <VarDeclaration Comment="True, if the service is provided via UDP. By default, it is false" Name="udp" Type="BOOL"/>
+      <VarDeclaration Comment="Service validity time period expressed in seconds. This gets converted to a date-time, and stored in the database" Name="ttl" Type="DINT"/>
+      <VarDeclaration Comment="Metadata belonging to a service/provider pair" Name="metadata" Type="WSTRING"/>
+      <VarDeclaration Comment="Endpoint (IP:PORT/URI) of the Service Registry" Name="SREndpoint" Type="WSTRING"/>
+    </InputVars>
+  </SubAppInterfaceList>
+  <SubAppNetwork>
+    <FB Comment="" Name="Reset" Type="E_MERGE" x="13520.0" y="-425.0"/>
+    <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="6550.0" y="1300.0"/>
+    <FB Comment="" Name="RegUnreg" Type="E_SWITCH" x="11355.0" y="2215.0"/>
+    <FB Comment="" Name="Register" Type="E_SR" x="7125.0" y="-25.0"/>
+    <FB Comment="" Name="RegisterService" Type="RegisterService" x="13325.0" y="2840.0"/>
+    <FB Comment="" Name="RegUnregDone" Type="E_SWITCH" x="12160.0" y="590.0"/>
+    <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="8350.0" y="2160.0"/>
+    <FB Comment="" Name="GetName" Type="GET_AT_INDEX" x="5840.0" y="4935.0"/>
+    <FB Comment="" Name="E_CTU" Type="E_CTU" x="4610.0" y="5115.0"/>
+    <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="9505.0" y="5125.0"/>
+    <FB Comment="" Name="WSTRING2WSTRING" Type="WSTRING2WSTRING" x="7300.0" y="5250.0"/>
+    <FB Comment="" Name="IsLast" Type="F_EQ" x="8705.0" y="5155.0">
+      <Parameter Name="IN1" Value="WSTRING#&quot;&quot;"/>
+    </FB>
+    <FB Comment="" Name="GetURI" Type="GET_AT_INDEX" x="5830.0" y="5730.0"/>
+    <FB Comment="" Name="E_SPLIT" Type="E_SPLIT" x="10310.0" y="5150.0"/>
+    <FB Comment="" Name="PermitUnreg" Type="E_PERMIT" x="4770.0" y="-715.0"/>
+    <FB Comment="" Name="F_NOT" Type="F_NOT" x="3775.0" y="-715.0"/>
+    <FB Comment="" Name="PermitReg" Type="E_PERMIT" x="4775.0" y="-1680.0"/>
+    <FB Comment="" Name="Regblock" Type="E_SR" x="2710.0" y="-1410.0"/>
+    <FB Comment="" Name="F_NOT_1" Type="F_NOT" x="3780.0" y="-1720.0"/>
+    <FB Comment="" Name="UnRegBlock" Type="E_SR" x="2675.0" y="-535.0"/>
+    <FB Comment="" Name="ARRAY2ARRAY_10_WSTRING" Type="ARRAY2ARRAY_10_WSTRING" x="2875.0" y="4810.0"/>
+    <FB Comment="" Name="ARRAY2ARRAY_10_WSTRING_1" Type="ARRAY2ARRAY_10_WSTRING" x="2910.0" y="3760.0"/>
+    <FB Comment="" Name="RegisterServiceOpcUa" Type="RegisterServiceOpcUa" x="15900.0" y="3200.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="Reset.EI1" Source="RegUnregDone.EO0" dx1="420.0"/>
+      <Connection Comment="" Destination="Reset.EI2" Source="RegUnregDone.EO1" dx1="580.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadService.CNF" dx1="160.0"/>
+      <Connection Comment="" Destination="RegUnreg.EI" Source="FieldsToServiceRegistryEntry.CNF" dx1="535.0"/>
+      <Connection Comment="" Destination="RegisterService.unregister" Source="RegUnreg.EO0" dx1="910.0"/>
+      <Connection Comment="" Destination="RegisterService.register" Source="RegUnreg.EO1" dx1="760.0"/>
+      <Connection Comment="" Destination="registerDone" Source="RegUnregDone.EO1" dx1="60.0" dx2="60.0" dy="-385.0"/>
+      <Connection Comment="" Destination="unregisterUndone" Source="RegUnregDone.EO0" dx1="60.0" dx2="60.0" dy="-285.0"/>
+      <Connection Comment="" Destination="E_SWITCH.EI" Source="IsLast.CNF" dx1="210.0"/>
+      <Connection Comment="" Destination="IsLast.REQ" Source="WSTRING2WSTRING.CNF" dx1="235.0"/>
+      <Connection Comment="" Destination="WSTRING2WSTRING.REQ" Source="GetURI.CNF" dx1="515.0"/>
+      <Connection Comment="" Destination="E_CTU.CU" Source="E_SPLIT.EO1" dx1="60.0" dx2="60.0" dy="-690.0"/>
+      <Connection Comment="" Destination="E_SPLIT.EI" Source="E_SWITCH.EO0" dx1="185.0"/>
+      <Connection Comment="" Destination="E_CTU.R" Source="E_SWITCH.EO1" dx1="200.0" dx2="625.0" dy="1250.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="E_SPLIT.EO2" dx1="280.0" dx2="205.0" dy="-1140.0"/>
+      <Connection Comment="" Destination="GetName.REQ" Source="RegisterService.doneRegister" dx1="60.0" dx2="60.0" dy="-550.0"/>
+      <Connection Comment="" Destination="RegUnregDone.EI" Source="E_CTU.RO" dx1="285.0"/>
+      <Connection Comment="" Destination="PermitReg.EI" Source="F_NOT_1.CNF" dx1="300.0"/>
+      <Connection Comment="" Destination="PermitUnreg.EI" Source="F_NOT.CNF"/>
+      <Connection Comment="" Destination="Register.R" Source="PermitUnreg.EO" dx1="960.0"/>
+      <Connection Comment="" Destination="Register.S" Source="PermitReg.EO" dx1="1330.0"/>
+      <Connection Comment="" Destination="UnRegBlock.R" Source="Reset.EO" dx1="60.0" dx2="60.0" dy="420.0"/>
+      <Connection Comment="" Destination="Regblock.R" Source="Reset.EO" dx1="60.0" dx2="60.0" dy="-1685.0"/>
+      <Connection Comment="" Destination="F_NOT_1.REQ" Source="register" dx1="1060.0"/>
+      <Connection Comment="" Destination="F_NOT.REQ" Source="unregister" dx1="1290.0"/>
+      <Connection Comment="" Destination="UnRegBlock.S" Source="PermitUnreg.EO" dx1="60.0" dx2="60.0" dy="-170.0"/>
+      <Connection Comment="" Destination="Regblock.S" Source="PermitUnreg.EO" dx1="150.0" dx2="60.0" dy="-345.0"/>
+      <Connection Comment="" Destination="Regblock.S" Source="PermitReg.EO" dx1="60.0" dx2="410.0" dy="-335.0"/>
+      <Connection Comment="" Destination="UnRegBlock.S" Source="PermitReg.EO" dx1="180.0" dx2="60.0" dy="730.0"/>
+      <Connection Comment="" Destination="GetName.REQ" Source="RegisterService.doneUnregister" dx1="240.0" dx2="190.0" dy="-910.0"/>
+      <Connection Comment="" Destination="GetName.REQ" Source="ARRAY2ARRAY_10_WSTRING.CNF" dx1="875.0"/>
+      <Connection Comment="" Destination="ARRAY2ARRAY_10_WSTRING.REQ" Source="ARRAY2ARRAY_10_WSTRING_1.CNF" dx1="60.0" dx2="60.0" dy="690.0"/>
+      <Connection Comment="" Destination="ARRAY2ARRAY_10_WSTRING_1.REQ" Source="PermitReg.EO" dx1="340.0" dx2="60.0" dy="3055.0"/>
+      <Connection Comment="" Destination="ARRAY2ARRAY_10_WSTRING_1.REQ" Source="PermitUnreg.EO" dx1="60.0" dx2="60.0" dy="2675.0"/>
+      <Connection Comment="" Destination="GetURI.REQ" Source="GetName.CNF" dx1="60.0" dx2="60.0" dy="395.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="110.0"/>
+      <Connection Comment="" Destination="RegUnreg.G" Source="Register.Q" dx1="2800.0"/>
+      <Connection Comment="" Destination="RegUnregDone.G" Source="Register.Q" dx1="3350.0"/>
+      <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="530.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.interfaces" Source="interfaces" dx1="2355.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.serviceMetadata" Source="serviceMetadata" dx1="2240.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.version" Source="version" dx1="1130.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.udp" Source="udp" dx1="925.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.ttl" Source="ttl" dx1="725.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.metadata" Source="metadata" dx1="565.0"/>
+      <Connection Comment="" Destination="RegisterService.endpoint" Source="SREndpoint" dx1="360.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="provider" dx1="1625.0"/>
+      <Connection Comment="" Destination="GetName.INDEX" Source="E_CTU.CV" dx1="500.0"/>
+      <Connection Comment="" Destination="WSTRING2WSTRING.IN" Source="GetName.OUT" dx1="425.0"/>
+      <Connection Comment="" Destination="GetURI.INDEX" Source="E_CTU.CV" dx1="495.0"/>
+      <Connection Comment="" Destination="E_SWITCH.G" Source="IsLast.OUT" dx1="210.0"/>
+      <Connection Comment="" Destination="IsLast.IN2" Source="WSTRING2WSTRING.OUT" dx1="305.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.serviceURI" Source="GetURI.OUT" dx1="660.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.serviceDefinition" Source="GetName.OUT" dx1="60.0" dx2="60.0" dy="-1865.0"/>
+      <Connection Comment="" Destination="PermitUnreg.PERMIT" Source="F_NOT.OUT"/>
+      <Connection Comment="" Destination="F_NOT.IN" Source="UnRegBlock.Q" dx1="115.0"/>
+      <Connection Comment="" Destination="PermitReg.PERMIT" Source="F_NOT_1.OUT" dx1="300.0"/>
+      <Connection Comment="" Destination="F_NOT_1.IN" Source="Regblock.Q" dx1="225.0"/>
+      <Connection Comment="" Destination="GetURI.IN_ARRAY" Source="ARRAY2ARRAY_10_WSTRING.OUT" dx1="445.0"/>
+      <Connection Comment="" Destination="ARRAY2ARRAY_10_WSTRING.IN" Source="serviceURI" dx1="1090.0"/>
+      <Connection Comment="" Destination="GetName.IN_ARRAY" Source="ARRAY2ARRAY_10_WSTRING_1.OUT" dx1="1380.0"/>
+      <Connection Comment="" Destination="ARRAY2ARRAY_10_WSTRING_1.IN" Source="serviceDefinition" dx1="1305.0"/>
+    </DataConnections>
+    <AdapterConnections>
+      <Connection Comment="" Destination="RegisterServiceOpcUa.registerService" Source="RegisterService.registerService" dx1="425.0"/>
+    </AdapterConnections>
+  </SubAppNetwork>
+</SubAppType>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServiceFullOpcUa.SUB b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServiceFullOpcUa.SUB
new file mode 100644
index 0000000..065ad2f
--- /dev/null
+++ b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServiceFullOpcUa.SUB
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<SubAppType Comment="Register a Service using  OPC UA. All possible parameters are available to be set" Name="RegisterServiceFullOpcUa">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <SubAppInterfaceList>
+    <SubAppEventInputs>
+      <SubAppEvent Comment="Register the service" Name="register" Type="Event"/>
+      <SubAppEvent Comment="Unregister the service" Name="unregister" Type="Event"/>
+    </SubAppEventInputs>
+    <SubAppEventOutputs>
+      <SubAppEvent Comment="Register finished" Name="doneRegister" Type="Event"/>
+      <SubAppEvent Comment="Unregister finished" Name="doneUnregister" Type="Event"/>
+    </SubAppEventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Identification of the system" Name="systemName" Type="WSTRING"/>
+      <VarDeclaration Comment="Address of the offered services" Name="address" Type="WSTRING"/>
+      <VarDeclaration Comment="Port of the of the offered services" Name="port" Type="DINT"/>
+      <VarDeclaration Comment="Authentication info of the system" Name="authenticationInfo" Type="WSTRING"/>
+      <VarDeclaration Comment="Identification of the service" Name="serviceDefinition" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Interfaces implemented by the service" Name="interfaces" Type="WSTRING"/>
+      <VarDeclaration ArraySize="10" Comment="Metadata of the service in key=value format" Name="serviceMetadata" Type="WSTRING"/>
+      <VarDeclaration Comment="The URL subpath of the Service within the address:port of the Provider" Name="serviceURI" Type="WSTRING"/>
+      <VarDeclaration Comment="The version numbering of the Service provided" Name="version" Type="DINT"/>
+      <VarDeclaration Comment="True, if the service is provided via UDP. By default, it is false" Name="udp" Type="BOOL"/>
+      <VarDeclaration Comment="Service validity time period expressed in seconds. This gets converted to a date-time, and stored in the database" Name="ttl" Type="DINT"/>
+      <VarDeclaration Comment="Metadata belonging to a service/provider pair" Name="metadata" Type="WSTRING"/>
+      <VarDeclaration Comment="Endpoint (IP:PORT/URI) of the Service Registry" Name="SRendpoint" Type="WSTRING"/>
+    </InputVars>
+  </SubAppInterfaceList>
+  <SubAppNetwork>
+    <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="1890.0" y="135.0"/>
+    <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="1940.0" y="1095.0"/>
+    <FB Comment="" Name="E_SR" Type="E_SR" x="5450.0" y="1200.0"/>
+    <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="6115.0" y="1880.0"/>
+    <SubApp Comment="" Name="RegisterServicePartialOpcUa" Type="RegisterServicePartialOpcUa" x="7125.0" y="2185.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="unregister" dx1="975.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="register" dx1="975.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="480.0"/>
+      <Connection Comment="" Destination="E_SR.S" Source="register" dx1="4335.0"/>
+      <Connection Comment="" Destination="E_SR.R" Source="unregister" dx1="3725.0"/>
+      <Connection Comment="" Destination="E_SWITCH.EI" Source="FieldsToArrowheadService.CNF" dx1="1465.0"/>
+      <Connection Comment="" Destination="RegisterServicePartialOpcUa.register" Source="E_SWITCH.EO1" dx1="280.0"/>
+      <Connection Comment="" Destination="RegisterServicePartialOpcUa.unregister" Source="E_SWITCH.EO0" dx1="345.0"/>
+      <Connection Comment="" Destination="doneRegister" Source="RegisterServicePartialOpcUa.doneRegister" dx1="60.0" dx2="60.0" dy="-1135.0"/>
+      <Connection Comment="" Destination="doneUnregister" Source="RegisterServicePartialOpcUa.doneUnregister" dx1="60.0" dx2="60.0" dy="-1135.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.systemName" Source="systemName" dx1="975.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.address" Source="address" dx1="975.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.port" Source="port" dx1="975.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.authenticationInfo" Source="authenticationInfo" dx1="935.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.serviceDefinition" Source="serviceDefinition" dx1="875.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.interfaces" Source="interfaces" dx1="790.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.serviceMetadata" Source="serviceMetadata" dx1="695.0"/>
+      <Connection Comment="" Destination="E_SWITCH.G" Source="E_SR.Q" dx1="215.0"/>
+      <Connection Comment="" Destination="RegisterServicePartialOpcUa.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="330.0"/>
+      <Connection Comment="" Destination="RegisterServicePartialOpcUa.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="490.0"/>
+      <Connection Comment="" Destination="RegisterServicePartialOpcUa.serviceURI" Source="serviceURI" dx1="615.0"/>
+      <Connection Comment="" Destination="RegisterServicePartialOpcUa.version" Source="version" dx1="485.0"/>
+      <Connection Comment="" Destination="RegisterServicePartialOpcUa.udp" Source="udp" dx1="375.0"/>
+      <Connection Comment="" Destination="RegisterServicePartialOpcUa.ttl" Source="ttl" dx1="275.0"/>
+      <Connection Comment="" Destination="RegisterServicePartialOpcUa.metadata" Source="metadata" dx1="175.0"/>
+      <Connection Comment="" Destination="RegisterServicePartialOpcUa.SRendpoint" Source="SRendpoint" dx1="90.0"/>
+    </DataConnections>
+  </SubAppNetwork>
+</SubAppType>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServiceOpcUa.fbt b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServiceOpcUa.fbt
new file mode 100644
index 0000000..77c1134
--- /dev/null
+++ b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServiceOpcUa.fbt
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Register Service using OPC UA" Name="RegisterServiceOpcUa">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <Sockets>
+      <AdapterDeclaration Comment="Register Service adapter" Name="registerService" Type="RegisterServiceAdp" x="-155.0" y="1810.0"/>
+    </Sockets>
+  </InterfaceList>
+  <FBNetwork>
+    <FB Comment="" Name="InitFlagReg" Type="E_SR" x="7410.0" y="695.0"/>
+    <FB Comment="" Name="E_PERMIT" Type="E_PERMIT" x="9100.0" y="300.0"/>
+    <FB Comment="" Name="CreateRegisterID" Type="APPEND_STRING_3" x="3400.0" y="900.0">
+      <Parameter Name="IN_1" Value="STRING#opc_ua[CALL_METHOD; "/>
+      <Parameter Name="IN_3" Value="STRING##; /Objects/2:ServiceRegistry/2:register]"/>
+    </FB>
+    <FB Comment="" Name="F_STRING_TO_WSTRING" Type="F_STRING_TO_WSTRING" x="4600.0" y="900.0"/>
+    <FB Comment="" Name="E_PERMIT_1" Type="E_PERMIT" x="9100.0" y="2100.0"/>
+    <FB Comment="" Name="InitFlagUnReg" Type="E_SR" x="7400.0" y="2400.0"/>
+    <FB Comment="" Name="CreateUnRegisterID" Type="APPEND_STRING_3" x="3400.0" y="3000.0">
+      <Parameter Name="IN_1" Value="STRING#opc_ua[CALL_METHOD; "/>
+      <Parameter Name="IN_3" Value="STRING##; /Objects/2:ServiceRegistry/2:remove]"/>
+    </FB>
+    <FB Comment="" Name="F_STRING_TO_WSTRING_1" Type="F_STRING_TO_WSTRING" x="4585.0" y="3000.0"/>
+    <FB Comment="" Name="ANYToJSON" Type="ANYToJSON" x="6000.0" y="1905.0"/>
+    <FB Comment="" Name="Register" Type="CLIENT_1_0" x="10115.0" y="700.0"/>
+    <FB Comment="" Name="Unregister" Type="CLIENT_1_0" x="10090.0" y="2800.0"/>
+    <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="11500.0" y="800.0"/>
+    <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="13400.0" y="700.0"/>
+    <FB Comment="" Name="E_DELAY" Type="E_DELAY" x="15000.0" y="700.0">
+      <Parameter Name="DT" Value="T#250ms"/>
+    </FB>
+    <FB Comment="" Name="E_CTU" Type="E_CTU" x="12600.0" y="700.0">
+      <Parameter Name="PV" Value="UINT#3"/>
+    </FB>
+    <FB Comment="" Name="E_SWITCH_1_1" Type="E_SWITCH" x="13400.0" y="2800.0"/>
+    <FB Comment="" Name="E_SWITCH_2" Type="E_SWITCH" x="11500.0" y="2900.0"/>
+    <FB Comment="" Name="E_DELAY_1" Type="E_DELAY" x="15000.0" y="2800.0">
+      <Parameter Name="DT" Value="T#250ms"/>
+    </FB>
+    <FB Comment="" Name="E_CTU_1" Type="E_CTU" x="12600.0" y="2800.0">
+      <Parameter Name="PV" Value="UINT#3"/>
+    </FB>
+    <EventConnections>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.REQ" Source="CreateRegisterID.CNF"/>
+      <Connection Comment="" Destination="InitFlagReg.S" Source="F_STRING_TO_WSTRING.CNF" dx1="955.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING_1.REQ" Source="CreateUnRegisterID.CNF"/>
+      <Connection Comment="" Destination="InitFlagUnReg.S" Source="F_STRING_TO_WSTRING_1.CNF" dx1="1040.0"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="F_STRING_TO_WSTRING.CNF" dx1="265.0"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="F_STRING_TO_WSTRING_1.CNF" dx1="260.0"/>
+      <Connection Comment="" Destination="CreateRegisterID.REQ" Source="registerService.registerService" dx1="1185.0"/>
+      <Connection Comment="" Destination="CreateUnRegisterID.REQ" Source="registerService.unregisterService" dx1="1185.0"/>
+      <Connection Comment="" Destination="Register.INIT" Source="InitFlagReg.EO" dx1="1105.0"/>
+      <Connection Comment="" Destination="Register.REQ" Source="E_PERMIT.EO" dx1="290.0"/>
+      <Connection Comment="" Destination="E_PERMIT.EI" Source="Register.INITO" dx1="60.0" dx2="60.0" dy="-720.0"/>
+      <Connection Comment="" Destination="Unregister.INIT" Source="InitFlagUnReg.EO" dx1="1085.0"/>
+      <Connection Comment="" Destination="Unregister.REQ" Source="E_PERMIT_1.EO" dx1="290.0"/>
+      <Connection Comment="" Destination="E_PERMIT_1.EI" Source="Unregister.INITO" dx1="60.0" dx2="60.0" dy="-1155.0"/>
+      <Connection Comment="" Destination="E_SWITCH_1.EI" Source="E_CTU.CUO"/>
+      <Connection Comment="" Destination="E_DELAY.START" Source="E_SWITCH_1.EO0"/>
+      <Connection Comment="" Destination="E_CTU.CU" Source="E_SWITCH.EO0" dx1="310.0"/>
+      <Connection Comment="" Destination="InitFlagReg.R" Source="E_SWITCH.EO1" dx1="60.0" dx2="60.0" dy="-1250.0"/>
+      <Connection Comment="" Destination="registerService.doneRegister" Source="E_SWITCH.EO1" dx1="185.0" dx2="150.0" dy="-1690.0"/>
+      <Connection Comment="" Destination="E_SWITCH.EI" Source="Register.CNF"/>
+      <Connection Comment="" Destination="Register.REQ" Source="E_DELAY.EO" dx1="60.0" dx2="60.0" dy="-485.0"/>
+      <Connection Comment="" Destination="E_DELAY_1.START" Source="E_SWITCH_1_1.EO0"/>
+      <Connection Comment="" Destination="E_SWITCH_1_1.EI" Source="E_CTU_1.CUO"/>
+      <Connection Comment="" Destination="E_CTU_1.CU" Source="E_SWITCH_2.EO0" dx1="310.0"/>
+      <Connection Comment="" Destination="InitFlagUnReg.R" Source="E_SWITCH_2.EO1" dx1="260.0" dx2="60.0" dy="-1565.0"/>
+      <Connection Comment="" Destination="registerService.doneUnregister" Source="E_SWITCH_2.EO1" dx1="270.0" dx2="60.0" dy="770.0"/>
+      <Connection Comment="" Destination="E_SWITCH_2.EI" Source="Unregister.CNF"/>
+      <Connection Comment="" Destination="Unregister.REQ" Source="E_DELAY_1.EO" dx1="60.0" dx2="60.0" dy="-775.0"/>
+      <Connection Comment="" Destination="InitFlagUnReg.R" Source="E_SWITCH_1_1.EO1" dx1="60.0" dx2="60.0" dy="1160.0"/>
+      <Connection Comment="" Destination="InitFlagReg.R" Source="E_SWITCH_1.EO1" dx1="60.0" dx2="230.0" dy="-1450.0"/>
+      <Connection Comment="" Destination="registerService.doneUnregister" Source="E_SWITCH_1_1.EO1" dx1="330.0" dx2="60.0" dy="1800.0"/>
+      <Connection Comment="" Destination="registerService.doneRegister" Source="E_SWITCH_1.EO1" dx1="270.0" dx2="490.0" dy="-2080.0"/>
+      <Connection Comment="" Destination="E_CTU_1.R" Source="E_SWITCH_1_1.EO1" dx1="60.0" dx2="60.0" dy="-505.0"/>
+      <Connection Comment="" Destination="E_CTU_1.R" Source="E_SWITCH_2.EO1" dx1="310.0"/>
+      <Connection Comment="" Destination="E_CTU.R" Source="E_SWITCH.EO1" dx1="310.0"/>
+      <Connection Comment="" Destination="E_CTU.R" Source="E_SWITCH_1.EO1" dx1="60.0" dx2="60.0" dy="120.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="E_PERMIT.PERMIT" Source="InitFlagReg.Q" dx1="790.0"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.IN" Source="CreateRegisterID.OUT"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING_1.IN" Source="CreateUnRegisterID.OUT"/>
+      <Connection Comment="" Destination="E_PERMIT_1.PERMIT" Source="InitFlagUnReg.Q" dx1="720.0"/>
+      <Connection Comment="" Destination="ANYToJSON.input" Source="registerService.serviceRegistryEntry" dx1="2490.0"/>
+      <Connection Comment="" Destination="CreateRegisterID.IN_2" Source="registerService.endpoint" dx1="755.0"/>
+      <Connection Comment="" Destination="CreateUnRegisterID.IN_2" Source="registerService.endpoint" dx1="765.0"/>
+      <Connection Comment="" Destination="Register.QI" Source="InitFlagReg.Q" dx1="1105.0"/>
+      <Connection Comment="" Destination="Register.ID" Source="F_STRING_TO_WSTRING.OUT"/>
+      <Connection Comment="" Destination="Register.SD_1" Source="ANYToJSON.output" dx1="2355.0"/>
+      <Connection Comment="" Destination="Unregister.QI" Source="InitFlagUnReg.Q" dx1="725.0"/>
+      <Connection Comment="" Destination="Unregister.ID" Source="F_STRING_TO_WSTRING_1.OUT"/>
+      <Connection Comment="" Destination="Unregister.SD_1" Source="ANYToJSON.output" dx1="2355.0"/>
+      <Connection Comment="" Destination="E_SWITCH_1.G" Source="E_CTU.Q"/>
+      <Connection Comment="" Destination="E_SWITCH.G" Source="Register.QO" dx1="410.0"/>
+      <Connection Comment="" Destination="E_SWITCH_1_1.G" Source="E_CTU_1.Q"/>
+      <Connection Comment="" Destination="E_SWITCH_2.G" Source="Unregister.QO" dx1="425.0"/>
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServiceOpcUaOriginal.fbt b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServiceOpcUaOriginal.fbt
new file mode 100644
index 0000000..d460c4b
--- /dev/null
+++ b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServiceOpcUaOriginal.fbt
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Register Service using OPC UA" Name="RegisterServiceOpcUaOriginal">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <EventOutputs>
+      <Event Comment="" Name="registryDone" Type="Event">
+        <With Var="registryStatus"/>
+      </Event>
+    </EventOutputs>
+    <OutputVars>
+      <VarDeclaration Comment="" Name="registryStatus" Type="STRING"/>
+    </OutputVars>
+    <Sockets>
+      <AdapterDeclaration Comment="Register Service adapter" Name="registerService" Type="RegisterServiceAdp" x="-155.0" y="1810.0"/>
+    </Sockets>
+  </InterfaceList>
+  <FBNetwork>
+    <FB Comment="" Name="CreateRegisterID" Type="APPEND_STRING_3" x="3400.0" y="900.0">
+      <Parameter Name="IN_1" Value="STRING#opc_ua["/>
+      <Parameter Name="IN_3" Value="STRING##(2:,register,)]"/>
+    </FB>
+    <FB Comment="" Name="F_STRING_TO_WSTRING" Type="F_STRING_TO_WSTRING" x="4600.0" y="900.0"/>
+    <FB Comment="" Name="CreateUnRegisterID" Type="APPEND_STRING_3" x="3400.0" y="3000.0">
+      <Parameter Name="IN_1" Value="STRING#opc_ua["/>
+      <Parameter Name="IN_3" Value="STRING##(2:,remove,)]"/>
+    </FB>
+    <FB Comment="" Name="F_STRING_TO_WSTRING_1" Type="F_STRING_TO_WSTRING" x="4585.0" y="3000.0"/>
+    <FB Comment="" Name="ANYToJSON" Type="ANYToJSON" x="6000.0" y="1905.0"/>
+    <FB Comment="" Name="CLIENT_1_0" Type="CLIENT_1_0" x="10100.0" y="2000.0">
+      <Parameter Name="QI" Value="1"/>
+    </FB>
+    <FB Comment="" Name="CLIENT_1_0_1" Type="CLIENT_1" x="10800.0" y="700.0">
+      <Parameter Name="QI" Value="1"/>
+    </FB>
+    <FB Comment="" Name="STRING2STRING" Type="STRING2STRING" x="11700.0" y="800.0"/>
+    <FB Comment="" Name="E_DELAY" Type="E_DELAY" x="10000.0" y="300.0">
+      <Parameter Name="DT" Value="T#1s"/>
+    </FB>
+    <FB Comment="" Name="E_DELAY_1" Type="E_DELAY" x="9300.0" y="1400.0">
+      <Parameter Name="DT" Value="T#1s"/>
+    </FB>
+    <EventConnections>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.REQ" Source="CreateRegisterID.CNF"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING_1.REQ" Source="CreateUnRegisterID.CNF"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="F_STRING_TO_WSTRING.CNF" dx1="265.0"/>
+      <Connection Comment="" Destination="ANYToJSON.REQ" Source="F_STRING_TO_WSTRING_1.CNF" dx1="260.0"/>
+      <Connection Comment="" Destination="CreateRegisterID.REQ" Source="registerService.registerService" dx1="1185.0"/>
+      <Connection Comment="" Destination="CreateUnRegisterID.REQ" Source="registerService.unregisterService" dx1="1185.0"/>
+      <Connection Comment="" Destination="registerService.doneUnregister" Source="CLIENT_1_0.CNF" dx1="570.0" dx2="60.0" dy="1740.0"/>
+      <Connection Comment="" Destination="registerService.doneRegister" Source="CLIENT_1_0_1.CNF" dx1="60.0" dx2="60.0" dy="175.0"/>
+      <Connection Comment="" Destination="STRING2STRING.REQ" Source="CLIENT_1_0_1.CNF"/>
+      <Connection Comment="" Destination="registryDone" Source="STRING2STRING.CNF" dx1="60.0" dx2="60.0" dy="-440.0"/>
+      <Connection Comment="" Destination="CLIENT_1_0_1.REQ" Source="E_DELAY.EO" dx1="195.0"/>
+      <Connection Comment="" Destination="E_DELAY.START" Source="CLIENT_1_0_1.INITO" dx1="60.0" dx2="60.0" dy="-200.0"/>
+      <Connection Comment="" Destination="CLIENT_1_0_1.INIT" Source="F_STRING_TO_WSTRING.CNF" dx1="2655.0"/>
+      <Connection Comment="" Destination="CLIENT_1_0.INIT" Source="F_STRING_TO_WSTRING_1.CNF" dx1="2300.0"/>
+      <Connection Comment="" Destination="E_DELAY_1.START" Source="CLIENT_1_0.INITO" dx1="60.0" dx2="330.0" dy="-160.0"/>
+      <Connection Comment="" Destination="CLIENT_1_0.REQ" Source="E_DELAY_1.EO" dx1="175.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING.IN" Source="CreateRegisterID.OUT"/>
+      <Connection Comment="" Destination="F_STRING_TO_WSTRING_1.IN" Source="CreateUnRegisterID.OUT"/>
+      <Connection Comment="" Destination="ANYToJSON.input" Source="registerService.serviceRegistryEntry" dx1="2595.0"/>
+      <Connection Comment="" Destination="CreateRegisterID.IN_2" Source="registerService.endpoint" dx1="755.0"/>
+      <Connection Comment="" Destination="CreateUnRegisterID.IN_2" Source="registerService.endpoint" dx1="765.0"/>
+      <Connection Comment="" Destination="CLIENT_1_0_1.ID" Source="F_STRING_TO_WSTRING.OUT"/>
+      <Connection Comment="" Destination="CLIENT_1_0_1.SD_1" Source="ANYToJSON.output" dx1="2355.0"/>
+      <Connection Comment="" Destination="STRING2STRING.IN" Source="CLIENT_1_0_1.RD_1" dx1="235.0"/>
+      <Connection Comment="" Destination="registryStatus" Source="STRING2STRING.OUT" dx1="60.0" dx2="60.0" dy="-515.0"/>
+      <Connection Comment="" Destination="CLIENT_1_0.ID" Source="F_STRING_TO_WSTRING_1.OUT" dx1="2300.0"/>
+      <Connection Comment="" Destination="CLIENT_1_0.SD_1" Source="ANYToJSON.output" dx1="1800.0"/>
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServicePartialOpcUa.SUB b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServicePartialOpcUa.SUB
new file mode 100644
index 0000000..4524b71
--- /dev/null
+++ b/Arrowhead/Arrowhead/ServiceRegistry/OpcUa/RegisterServicePartialOpcUa.SUB
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<SubAppType Comment="Register a Service using OPC UA. The system information is encapsulated" Name="RegisterServicePartialOpcUa">
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2019-09-17" Organization="fortiss GmbH" Version="1.0"/>
+  <SubAppInterfaceList>
+    <SubAppEventInputs>
+      <SubAppEvent Comment="Register the service" Name="register" Type="Event"/>
+      <SubAppEvent Comment="Unregister the service" Name="unregister" Type="Event"/>
+    </SubAppEventInputs>
+    <SubAppEventOutputs>
+      <SubAppEvent Comment="Register finished" Name="doneRegister" Type="Event"/>
+      <SubAppEvent Comment="Unregister finished" Name="doneUnregister" Type="Event"/>
+    </SubAppEventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="The Arrowhead Service object that is provided (SD and supported IDD-s)" Name="providedService" Type="ArrowheadService"/>
+      <VarDeclaration Comment="ArrowheadSystem that is providing the Service" Name="provider" Type="ArrowheadSystem"/>
+      <VarDeclaration Comment="The URL subpath of the Service within the address:port of the Provider" Name="serviceURI" Type="WSTRING"/>
+      <VarDeclaration Comment="The version numbering of the Service provided" Name="version" Type="DINT"/>
+      <VarDeclaration Comment="True, if the service is provided via UDP. By default, it is false" Name="udp" Type="BOOL"/>
+      <VarDeclaration Comment="Service validity time period expressed in seconds. This gets converted to a date-time, and stored in the database" Name="ttl" Type="DINT"/>
+      <VarDeclaration Comment="Metadata belonging to a service/provider pair" Name="metadata" Type="WSTRING"/>
+      <VarDeclaration Comment="Endpoint (IP:PORT/URI) of the Service Registry" Name="SRendpoint" Type="WSTRING"/>
+    </InputVars>
+  </SubAppInterfaceList>
+  <SubAppNetwork>
+    <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="5420.0" y="1385.0"/>
+    <FB Comment="" Name="RegisterService" Type="RegisterService" x="8640.0" y="2490.0"/>
+    <FB Comment="" Name="E_SR" Type="E_SR" x="6365.0" y="-135.0"/>
+    <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="7880.0" y="415.0"/>
+    <FB Comment="" Name="E_REND" Type="E_REND" x="7210.0" y="270.0"/>
+    <FB Comment="" Name="RegisterServiceOpcUa" Type="RegisterServiceOpcUa" x="10525.0" y="3290.0"/>
+    <EventConnections>
+      <Connection Comment="" Destination="doneRegister" Source="RegisterService.doneRegister" dx1="60.0" dx2="60.0" dy="-1285.0"/>
+      <Connection Comment="" Destination="doneUnregister" Source="RegisterService.doneUnregister" dx1="60.0" dx2="60.0" dy="-1285.0"/>
+      <Connection Comment="" Destination="RegisterService.register" Source="E_SWITCH.EO1" dx1="80.0"/>
+      <Connection Comment="" Destination="RegisterService.unregister" Source="E_SWITCH.EO0" dx1="225.0"/>
+      <Connection Comment="" Destination="E_SR.S" Source="register" dx1="2855.0"/>
+      <Connection Comment="" Destination="E_SR.R" Source="unregister" dx1="2855.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="register" dx1="2420.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="unregister" dx1="2420.0"/>
+      <Connection Comment="" Destination="E_REND.EI1" Source="register" dx1="3315.0"/>
+      <Connection Comment="" Destination="E_REND.EI1" Source="unregister" dx1="3315.0"/>
+      <Connection Comment="" Destination="E_REND.EI2" Source="FieldsToServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="-505.0"/>
+      <Connection Comment="" Destination="E_SWITCH.EI" Source="E_REND.EO" dx1="150.0"/>
+      <Connection Comment="" Destination="E_REND.R" Source="E_REND.EO" dx1="85.0" dx2="175.0" dy="-370.0"/>
+    </EventConnections>
+    <DataConnections>
+      <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="665.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.serviceURI" Source="serviceURI" dx1="615.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.version" Source="version" dx1="485.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.ttl" Source="ttl" dx1="275.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.metadata" Source="metadata" dx1="175.0"/>
+      <Connection Comment="" Destination="RegisterService.endpoint" Source="SRendpoint" dx1="90.0"/>
+      <Connection Comment="" Destination="E_SWITCH.G" Source="E_SR.Q" dx1="205.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.udp" Source="udp" dx1="375.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="provider" dx1="3285.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="providedService" dx1="2420.0"/>
+    </DataConnections>
+    <AdapterConnections>
+      <Connection Comment="" Destination="RegisterServiceOpcUa.registerService" Source="RegisterService.registerService" dx1="95.0"/>
+    </AdapterConnections>
+  </SubAppNetwork>
+</SubAppType>
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/ServiceQueryForm.dtp b/Arrowhead/Arrowhead/ServiceRegistry/ServiceQueryForm.dtp
index 174dd6d..e41ac01 100644
--- a/Arrowhead/Arrowhead/ServiceRegistry/ServiceQueryForm.dtp
+++ b/Arrowhead/Arrowhead/ServiceRegistry/ServiceQueryForm.dtp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
 <DataType Name="ServiceQueryForm" Comment="A service query form for the Arrowhead framework 4.0" >
-  <Identification Standard="61499-2" />
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2018-09-26" />
   <ASN1Tag Class="APPLICATION" Number="1" />
   <StructuredType >
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/ServiceRegistryEntry.dtp b/Arrowhead/Arrowhead/ServiceRegistry/ServiceRegistryEntry.dtp
index 40fd327..b53090f 100644
--- a/Arrowhead/Arrowhead/ServiceRegistry/ServiceRegistryEntry.dtp
+++ b/Arrowhead/Arrowhead/ServiceRegistry/ServiceRegistryEntry.dtp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
 <DataType Name="ServiceRegistryEntry" Comment="A service registry entry for the Arrowhead framework 4.0" >
-  <Identification Standard="61499-2" />
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2018-09-26" />
   <ASN1Tag Class="APPLICATION" Number="1" />
   <StructuredType >
diff --git a/Arrowhead/Arrowhead/ServiceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.fbt b/Arrowhead/Arrowhead/ServiceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.fbt
index e1eab2c..920789f 100644
--- a/Arrowhead/Arrowhead/ServiceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.fbt
+++ b/Arrowhead/Arrowhead/ServiceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.fbt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <FBType Comment="Helper FB to set the connection to a Service Registry Entry type" Name="ServiceRegistryEntry2ServiceRegistryEntry">
-  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: PL-2.0" Standard="61499-2"/>
+  <Identification Description="Copyright (c) 2019 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Author="Jose Cabral" Date="2019-01-28" Organization="fortiss GmbH" Version="1.0"/>
   <InterfaceList>
     <EventInputs>
diff --git a/Arrowhead/Arrowhead/common/ArrowheadCloud.dtp b/Arrowhead/Arrowhead/common/ArrowheadCloud.dtp
index 8aa45c9..44e75d1 100644
--- a/Arrowhead/Arrowhead/common/ArrowheadCloud.dtp
+++ b/Arrowhead/Arrowhead/common/ArrowheadCloud.dtp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
 <DataType Name="ArrowheadCloud" Comment="A cloud representation for the Arrowhead framework 4.0" >
-  <Identification Standard="61499-2" />
+  <Identification Description="Copyright (c) 2018 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2018-09-26" />
   <ASN1Tag Class="APPLICATION" Number="1" />
   <StructuredType >
diff --git a/Arrowhead/Arrowhead/common/ArrowheadService.dtp b/Arrowhead/Arrowhead/common/ArrowheadService.dtp
index 6820e7f..28a298d 100644
--- a/Arrowhead/Arrowhead/common/ArrowheadService.dtp
+++ b/Arrowhead/Arrowhead/common/ArrowheadService.dtp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
 <DataType Name="ArrowheadService" Comment="A service representation for the Arrowhead framework 4.0" >
-  <Identification Standard="61499-2" />
+  <Identification Description="Copyright (c) 2018 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2018-09-26" />
   <ASN1Tag Class="APPLICATION" Number="1" />
   <StructuredType >
diff --git a/Arrowhead/Arrowhead/common/ArrowheadSystem.dtp b/Arrowhead/Arrowhead/common/ArrowheadSystem.dtp
index 7fb9bdd..3f80a52 100644
--- a/Arrowhead/Arrowhead/common/ArrowheadSystem.dtp
+++ b/Arrowhead/Arrowhead/common/ArrowheadSystem.dtp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE DataType SYSTEM "http://www.holobloc.com/xml/DataType.dtd" >
 <DataType Name="ArrowheadService" Comment="A service representation for the Arrowhead framework 4.0" >
-  <Identification Standard="61499-2" />
+  <Identification Description="Copyright (c) 2018 fortiss GmbH &#13;&#10;&#13;&#10;This program and the accompanying materials are made &#13;&#10;available under the terms of the Eclipse Public License 2.0 &#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
   <VersionInfo Organization="fortiss GmbH" Version="1.0" Author="Jose Cabral" Date="2018-09-26" />
   <ASN1Tag Class="APPLICATION" Number="1" />
   <StructuredType >
diff --git a/Arrowhead/Arrowhead/examples/BlinkKoordinator.fbt b/Arrowhead/Arrowhead/examples/BlinkKoordinator.fbt
new file mode 100644
index 0000000..a29bbc6
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/BlinkKoordinator.fbt
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Tamplate for a simple Basic Function Block Type" Name="BlinkKoordinator">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2018-01-15" Organization="4DIAC-Consortium" Version="0.0"/>
+  <VersionInfo Author="AZ" Date="2016-05-26" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="" Name="Start" Type="Event">
+        <With Var="onOffTime"/>
+      </Event>
+      <Event Comment="" Name="Stop" Type="Event"/>
+      <Event Comment="" Name="Reset" Type="Event"/>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="" Name="startRed" Type="Event"/>
+      <Event Comment="" Name="stopRed" Type="Event"/>
+      <Event Comment="" Name="startYellow" Type="Event"/>
+      <Event Comment="" Name="stopYellow" Type="Event"/>
+      <Event Comment="" Name="startGreen" Type="Event"/>
+      <Event Comment="" Name="stopGreen" Type="Event"/>
+      <Event Comment="" Name="startBlue" Type="Event"/>
+      <Event Comment="" Name="stopBlue" Type="Event"/>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="" Name="onOffTime" Type="TIME"/>
+    </InputVars>
+    <OutputVars/>
+    <Plugs>
+      <AdapterDeclaration Comment="" Name="Timer" Type="ATimeOut"/>
+    </Plugs>
+  </InterfaceList>
+  <BasicFB>
+    <ECC>
+      <ECState Comment="Initial State" Name="START" x="475.0" y="1125.0"/>
+      <ECState Comment="" Name="LightsOn" x="2095.0" y="765.0">
+        <ECAction Output="Timer.STOP"/>
+        <ECAction Output="startRed"/>
+        <ECAction Output="startYellow"/>
+        <ECAction Output="startGreen"/>
+        <ECAction Output="startBlue"/>
+        <ECAction Algorithm="startLongWaiting" Output="Timer.START"/>
+      </ECState>
+      <ECState Comment="" Name="LightsOff" x="3800.0" y="780.0">
+        <ECAction Output="Timer.STOP"/>
+        <ECAction Output="stopRed"/>
+        <ECAction Output="stopYellow"/>
+        <ECAction Output="stopGreen"/>
+        <ECAction Output="stopBlue"/>
+        <ECAction Algorithm="startLongWaiting" Output="Timer.START"/>
+      </ECState>
+      <ECState Comment="" Name="Reset" x="2400.0" y="2000.0">
+        <ECAction Output="stopRed"/>
+        <ECAction Output="stopYellow"/>
+        <ECAction Output="stopGreen"/>
+        <ECAction Output="stopBlue"/>
+      </ECState>
+      <ECTransition Comment="" Condition="Start" Destination="LightsOn" Source="START" x="1600.0" y="1140.0"/>
+      <ECTransition Comment="" Condition="Timer.TimeOut" Destination="LightsOff" Source="LightsOn" x="3070.0" y="320.0"/>
+      <ECTransition Comment="" Condition="Stop" Destination="START" Source="LightsOn" x="1280.0" y="660.0"/>
+      <ECTransition Comment="" Condition="Stop" Destination="START" Source="LightsOff" x="350.0" y="-60.0"/>
+      <ECTransition Comment="" Condition="Timer.TimeOut" Destination="LightsOn" Source="LightsOff" x="3130.0" y="-230.0"/>
+      <ECTransition Comment="" Condition="Reset" Destination="Reset" Source="START" x="1550.0" y="1555.0"/>
+      <ECTransition Comment="" Condition="1" Destination="START" Source="Reset" x="480.0" y="1700.0"/>
+      <ECTransition Comment="" Condition="Reset" Destination="Reset" Source="LightsOn" x="2290.0" y="1440.0"/>
+      <ECTransition Comment="" Condition="Reset" Destination="Reset" Source="LightsOff" x="3805.0" y="1715.0"/>
+    </ECC>
+    <Algorithm Comment="set long waiting time" Name="startLongWaiting">
+      <ST Text="Timer.DT := onOffTime;"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/Arrowhead/examples/ProduceTemperaturePayload.fbt b/Arrowhead/Arrowhead/examples/ProduceTemperaturePayload.fbt
new file mode 100644
index 0000000..fa25d1f
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/ProduceTemperaturePayload.fbt
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Produce IndoorTemperature payload" Name="ProduceTemperaturePayload">
+  <Identification Description="Copyright (c) 2018 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Jose Cabral" Date="2018-09-21" Organization="fortiss GmbH" Version="1.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Produce Payload" Name="REQ" Type="Event">
+        <With Var="bu"/>
+        <With Var="v"/>
+        <With Var="t"/>
+        <With Var="n"/>
+        <With Var="bt"/>
+        <With Var="bn"/>
+        <With Var="ver"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Payload produced" Name="CNF" Type="Event">
+        <With Var="output"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Base Name, this field stores the name of the ArrowheadSystem" Name="bn" Type="WSTRING"/>
+      <VarDeclaration Comment="Base Time, this field contains the unix timestamp of the sensor readout" Name="bt" Type="LINT"/>
+      <VarDeclaration Comment="Base Unit of the sensor readout" Name="bu" Type="WSTRING"/>
+      <VarDeclaration Comment="Version identifier" Name="ver" Type="DINT"/>
+      <VarDeclaration Comment="Name of the temperature" Name="n" Type="WSTRING"/>
+      <VarDeclaration Comment="time of the value" Name="t" Type="LINT"/>
+      <VarDeclaration Comment="value" Name="v" Type="REAL"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Result payload" Name="output" Type="STRING"/>
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/Arrowhead/examples/RegsiterEmergencyLight.SUB b/Arrowhead/Arrowhead/examples/RegsiterEmergencyLight.SUB
new file mode 100644
index 0000000..dd7cd1e
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/RegsiterEmergencyLight.SUB
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE SubAppType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<SubAppType Comment="Subapplication Type" Name="RegsiterEmergencyLight">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="cabral" Date="2018-11-28" Version="1.0"/>
+  <SubAppInterfaceList>
+    <SubAppEventInputs>
+      <SubAppEvent Comment="" Name="Register" Type="Event"/>
+      <SubAppEvent Comment="" Name="Unregister" Type="Event"/>
+    </SubAppEventInputs>
+    <SubAppEventOutputs>
+      <SubAppEvent Comment="" Name="RegisterDone" Type="Event"/>
+      <SubAppEvent Comment="" Name="UnregisterDone" Type="Event"/>
+    </SubAppEventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="" InitialValue="WSTRING#wsnGateway144-mediator-0" Name="systemName" Type="WSTRING"/>
+      <VarDeclaration Comment="" InitialValue="WSTRING#%localIP%" Name="ipAddress" Type="WSTRING"/>
+    </InputVars>
+    <OutputVars/>
+  </SubAppInterfaceList>
+  <SubAppNetwork>
+    <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="1200.0" y="200.0">
+      <Parameter Name="serviceDefinition" Value="WSTRING#%serviceName%"/>
+      <Parameter Name="interfaces" Value="[&quot;plaintext&quot;]"/>
+    </FB>
+    <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="1200.0" y="1600.0">
+      <Parameter Name="port" Value="8080"/>
+    </FB>
+    <FB Comment="" Name="RegisterServiceHTTP" Type="RegisterServiceHTTP" x="6700.0" y="1700.0">
+      <Parameter Name="serviceRegistryAddress" Value="%serviceRegistryAddress%"/>
+    </FB>
+    <FB Comment="" Name="E_REND" Type="E_REND" x="5800.0" y="-400.0"/>
+    <FB Comment="" Name="E_REND_1" Type="E_REND" x="5800.0" y="800.0"/>
+    <FB Comment="" Name="RegisterService" Type="RegisterService" x="6600.0" y="-200.0"/>
+    <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="3600.0" y="1500.0">
+      <Parameter Name="serviceURI" Value="WSTRING#values"/>
+      <Parameter Name="version" Value="1"/>
+      <Parameter Name="udp" Value="FALSE"/>
+    </FB>
+    <DataConnections>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.address" Source="ipAddress" dx1="280.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.systemName" Source="systemName" dx1="425.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="185.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="615.0"/>
+      <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="410.0"/>
+    </DataConnections>
+    <EventConnections>
+      <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToArrowheadService.CNF" dx1="385.0" dx2="60.0" dy="825.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="Register" dx1="580.0"/>
+      <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="Unregister" dx1="580.0"/>
+      <Connection Comment="" Destination="E_REND.EI1" Source="Register" dx1="2515.0"/>
+      <Connection Comment="" Destination="E_REND.R" Source="E_REND_1.EO" dx1="60.0" dx2="60.0" dy="-300.0"/>
+      <Connection Comment="" Destination="E_REND_1.R" Source="E_REND.EO" dx1="60.0" dx2="180.0" dy="490.0"/>
+      <Connection Comment="" Destination="E_REND_1.EI1" Source="Unregister" dx1="5180.0"/>
+      <Connection Comment="" Destination="RegisterService.registerService" Source="E_REND.EO" dx1="315.0"/>
+      <Connection Comment="" Destination="RegisterService.unregisterService" Source="E_REND_1.EO" dx1="315.0"/>
+      <Connection Comment="" Destination="UnregisterDone" Source="RegisterService.doneUnregister" dx1="695.0"/>
+      <Connection Comment="" Destination="RegisterDone" Source="RegisterService.doneRegister" dx1="695.0"/>
+      <Connection Comment="" Destination="E_REND_1.EI2" Source="FieldsToServiceRegistryEntry.CNF" dx1="170.0"/>
+      <Connection Comment="" Destination="E_REND.EI2" Source="FieldsToServiceRegistryEntry.CNF" dx1="260.0"/>
+      <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="615.0"/>
+    </EventConnections>
+    <AdapterConnections>
+      <Connection Comment="" Destination="RegisterServiceHTTP.registerServiceAdapter" Source="RegisterService.registerServiceAdapter" dx1="60.0" dx2="60.0" dy="585.0"/>
+    </AdapterConnections>
+  </SubAppNetwork>
+</SubAppType>
diff --git a/Arrowhead/Arrowhead/examples/trafficLight/ATraficLight.adp b/Arrowhead/Arrowhead/examples/trafficLight/ATraficLight.adp
new file mode 100644
index 0000000..edc746d
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/trafficLight/ATraficLight.adp
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE AdapterType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<AdapterType Name="ATraficLight">
+  <Identification Standard="61499-1"/>
+  <VersionInfo Author="GE" Date="2008-04-22" Organization="4DIAC-Consortium" Version="0.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="" Name="Stopped" Type="Event"/>
+      <Event Comment="" Name="Allowed" Type="Event"/>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="" Name="OutOfService" Type="Event"/>
+      <Event Comment="" Name="Stop" Type="Event"/>
+      <Event Comment="" Name="Allow" Type="Event"/>
+    </EventOutputs>
+    <InputVars/>
+    <OutputVars/>
+  </InterfaceList>
+  <Service LeftInterface="SOCKET" RightInterface="PLUG">
+    <ServiceSequence Name="request_confirm">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ" Interface="SOCKET" Parameters="REQD"/>
+        <OutputPrimitive Event="REQ" Interface="PLUG" Parameters="REQD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="CNF" Interface="PLUG" Parameters="CNFD"/>
+        <OutputPrimitive Event="CNF" Interface="SOCKET" Parameters="CNFD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="indication_response">
+      <ServiceTransaction>
+        <InputPrimitive Event="IND" Interface="PLUG" Parameters="INDD"/>
+        <OutputPrimitive Event="IND" Interface="SOCKET" Parameters="INDD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="RSP" Interface="SOCKET" Parameters="RSPD"/>
+        <OutputPrimitive Event="RSP" Interface="PLUG" Parameters="RSPD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</AdapterType>
diff --git a/Arrowhead/Arrowhead/examples/trafficLight/CarLightCtl.fbt b/Arrowhead/Arrowhead/examples/trafficLight/CarLightCtl.fbt
new file mode 100644
index 0000000..e16b85d
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/trafficLight/CarLightCtl.fbt
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Function block for controling the operation of a car trafic light following the rules of Germany" Name="CarLightCtl">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2014-07-11" Organization="4DIAC-Consortium" Version="0.0"/>
+  <InterfaceList>
+    <EventInputs/>
+    <EventOutputs>
+      <Event Comment="" Name="UpdateLights" Type="Event">
+        <With Var="green"/>
+        <With Var="red"/>
+        <With Var="yellow"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Cycle time for the yellow light blinking in out of service" Name="yellowBlinkTime" Type="TIME"/>
+      <VarDeclaration Comment="Time the yellow light is on when switching from red to green" Name="yellowOnTime" Type="TIME"/>
+      <VarDeclaration Comment="Time the yellow light is on when swithcing from green to red" Name="yellowOffTime" Type="TIME"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="red" Type="BOOL"/>
+      <VarDeclaration Name="yellow" Type="BOOL"/>
+      <VarDeclaration Comment="" InitialValue="" Name="green" Type="BOOL"/>
+    </OutputVars>
+    <Sockets>
+      <AdapterDeclaration Comment="" Name="traficLight" Type="ATraficLight"/>
+    </Sockets>
+    <Plugs>
+      <AdapterDeclaration Name="timeOut" Type="ATimeOut"/>
+    </Plugs>
+  </InterfaceList>
+  <BasicFB>
+    <ECC>
+      <ECState Name="START" x="190.0" y="570.0"/>
+      <ECState Name="OutOfService" x="1615.0" y="1235.0">
+        <ECAction Algorithm="setBlinkTimeOut" Output="timeOut.START"/>
+      </ECState>
+      <ECState Name="Block" x="665.0" y="2375.0">
+        <ECAction Algorithm="Stop" Output="UpdateLights"/>
+        <ECAction Output="traficLight.Stopped"/>
+      </ECState>
+      <ECState Name="Open" x="2470.0" y="2375.0">
+        <ECAction Algorithm="Go" Output="UpdateLights"/>
+        <ECAction Output="traficLight.Allowed"/>
+      </ECState>
+      <ECState Name="ToggleYellow" x="2280.0" y="570.0">
+        <ECAction Algorithm="ToggleYellow" Output="UpdateLights"/>
+      </ECState>
+      <ECState Name="EnteringOoS" x="190.0" y="1235.0">
+        <ECAction Algorithm="AllOff" Output="UpdateLights"/>
+        <ECAction Output="timeOut.STOP"/>
+      </ECState>
+      <ECState Name="Allowing" x="1900.0" y="1710.0">
+        <ECAction Algorithm="Allowing" Output="UpdateLights"/>
+        <ECAction Output="timeOut.START"/>
+      </ECState>
+      <ECState Name="Stopping" x="570.0" y="2945.0">
+        <ECAction Algorithm="stopping" Output="UpdateLights"/>
+        <ECAction Output="timeOut.START"/>
+      </ECState>
+      <ECTransition Comment="" Condition="traficLight.Stop" Destination="Block" Source="OutOfService" x="1145.0" y="1870.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="ToggleYellow" Source="OutOfService" x="1925.0" y="910.0"/>
+      <ECTransition Comment="" Condition="1" Destination="OutOfService" Source="ToggleYellow" x="2375.0" y="1005.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="EnteringOoS" Source="START" x="300.0" y="950.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="EnteringOoS" Source="Block" x="360.0" y="1985.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="EnteringOoS" Source="Open" x="1075.0" y="3600.0"/>
+      <ECTransition Comment="" Condition="1" Destination="OutOfService" Source="EnteringOoS" x="1040.0" y="1040.0"/>
+      <ECTransition Comment="" Condition="traficLight.Allow" Destination="Allowing" Source="Block" x="1675.0" y="2115.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="Open" Source="Allowing" x="2305.0" y="2120.0"/>
+      <ECTransition Comment="" Condition="traficLight.Stop" Destination="Stopping" Source="Open" x="1750.0" y="2760.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="EnteringOoS" Source="Stopping" x="355.0" y="1975.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="Block" Source="Stopping" x="775.0" y="2735.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="EnteringOoS" Source="Allowing" x="360.0" y="1985.0"/>
+      <ECTransition Comment="" Condition="traficLight.Allow" Destination="Open" Source="OutOfService" x="3465.0" y="1960.0"/>
+    </ECC>
+    <Algorithm Comment="" Name="AllOff">
+      <ST Text="red := FALSE;&#10;yellow := FALSE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in stop mode (i.e., red := true, green := false)" Name="Stop">
+      <ST Text="red := TRUE;&#10;yellow := FALSE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in Walk mode (i.e., red := false, green := true)" Name="Go">
+      <ST Text="red := FALSE;&#10;yellow := FALSE;&#10;green := TRUE;"/>
+    </Algorithm>
+    <Algorithm Comment="" Name="setBlinkTimeOut">
+      <ST Text="timeOut.DT := yellowBlinkTime;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="ToggleYellow">
+      <ST Text="yellow := NOT yellow;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="Allowing">
+      <ST Text="yellow := TRUE;&#10;timeOut.DT := yellowOnTime;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="stopping">
+      <ST Text="green := FALSE;&#10;yellow := TRUE;&#10;&#10;timeOut.DT := yellowOffTime;"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/Arrowhead/examples/trafficLight/CarLightCtl_AT.fbt b/Arrowhead/Arrowhead/examples/trafficLight/CarLightCtl_AT.fbt
new file mode 100644
index 0000000..e050282
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/trafficLight/CarLightCtl_AT.fbt
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Function block for controling the operation of a car trafic light following the rules of Germany" Name="CarLightCtl_AT">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2014-07-11" Organization="4DIAC-Consortium" Version="0.0"/>
+  <CompilerInfo/>
+  <InterfaceList>
+    <EventInputs/>
+    <EventOutputs>
+      <Event Comment="" Name="UpdateLights" Type="Event">
+        <With Var="green"/>
+        <With Var="red"/>
+        <With Var="yellow"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Cycle time for a light blinking(i.e., out of service or switching from green to red)" Name="blinkTime" Type="TIME"/>
+      <VarDeclaration Comment="Time the yellow light is on when switching from red to green" Name="yellowOnTime" Type="TIME"/>
+      <VarDeclaration Comment="Time the yellow light is on when swithcing from green to red" Name="yellowOffTime" Type="TIME"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="red" Type="BOOL"/>
+      <VarDeclaration Name="yellow" Type="BOOL"/>
+      <VarDeclaration Comment="" InitialValue="" Name="green" Type="BOOL"/>
+    </OutputVars>
+    <Sockets>
+      <AdapterDeclaration Comment="" Name="traficLight" Type="ATraficLight"/>
+    </Sockets>
+    <Plugs>
+      <AdapterDeclaration Name="timeOut" Type="ATimeOut"/>
+    </Plugs>
+  </InterfaceList>
+  <BasicFB>
+    <InternalVars>
+      <VarDeclaration Comment="Internal Variable" Name="blinkCount" Type="UINT"/>
+    </InternalVars>
+    <ECC>
+      <ECState Name="START" x="190.0" y="570.0"/>
+      <ECState Name="OutOfService" x="1615.0" y="1235.0">
+        <ECAction Algorithm="setBlinkTimeOut" Output="timeOut.START"/>
+      </ECState>
+      <ECState Name="Block" x="665.0" y="2375.0">
+        <ECAction Algorithm="Stop" Output="UpdateLights"/>
+        <ECAction Output="traficLight.Stopped"/>
+      </ECState>
+      <ECState Name="Open" x="2470.0" y="2375.0">
+        <ECAction Algorithm="Go" Output="UpdateLights"/>
+        <ECAction Output="traficLight.Allowed"/>
+      </ECState>
+      <ECState Name="ToggleYellow" x="2280.0" y="570.0">
+        <ECAction Algorithm="ToggleYellow" Output="UpdateLights"/>
+      </ECState>
+      <ECState Name="EnteringOoS" x="190.0" y="1235.0">
+        <ECAction Algorithm="AllOff" Output="UpdateLights"/>
+        <ECAction Output="timeOut.STOP"/>
+      </ECState>
+      <ECState Name="Allowing" x="1900.0" y="1710.0">
+        <ECAction Algorithm="Allowing" Output="UpdateLights"/>
+        <ECAction Output="timeOut.START"/>
+      </ECState>
+      <ECState Name="Stopping" x="570.0" y="2945.0">
+        <ECAction Algorithm="stopping" Output="UpdateLights"/>
+        <ECAction Output="timeOut.START"/>
+      </ECState>
+      <ECState Name="StartGreenBlinking" x="3165.0" y="2900.0">
+        <ECAction Algorithm="StartBlinking" Output="UpdateLights"/>
+        <ECAction Output="timeOut.START"/>
+      </ECState>
+      <ECState Name="BlinkGreen" x="2660.0" y="3325.0">
+        <ECAction Algorithm="ToggleGreen" Output="UpdateLights"/>
+        <ECAction Output="timeOut.START"/>
+      </ECState>
+      <ECTransition Comment="" Condition="traficLight.Stop" Destination="Block" Source="OutOfService" x="1145.0" y="1870.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="ToggleYellow" Source="OutOfService" x="1925.0" y="910.0"/>
+      <ECTransition Comment="" Condition="1" Destination="OutOfService" Source="ToggleYellow" x="2375.0" y="1005.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="EnteringOoS" Source="START" x="300.0" y="950.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="EnteringOoS" Source="Block" x="360.0" y="1985.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="EnteringOoS" Source="Open" x="1075.0" y="3600.0"/>
+      <ECTransition Comment="" Condition="1" Destination="OutOfService" Source="EnteringOoS" x="1040.0" y="1040.0"/>
+      <ECTransition Comment="" Condition="traficLight.Allow" Destination="Allowing" Source="Block" x="1675.0" y="2115.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="Open" Source="Allowing" x="2305.0" y="2120.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="EnteringOoS" Source="Stopping" x="355.0" y="1975.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="Block" Source="Stopping" x="775.0" y="2735.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="EnteringOoS" Source="Allowing" x="360.0" y="1985.0"/>
+      <ECTransition Comment="" Condition="traficLight.Allow" Destination="Open" Source="OutOfService" x="3465.0" y="1960.0"/>
+      <ECTransition Comment="" Condition="traficLight.Stop" Destination="StartGreenBlinking" Source="Open" x="2705.0" y="2810.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="BlinkGreen" Source="StartGreenBlinking" x="3015.0" y="3170.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut&amp;10 = blinkCount" Destination="Stopping" Source="BlinkGreen" x="1195.0" y="3380.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="BlinkGreen" Source="BlinkGreen" x="2615.0" y="3705.0"/>
+    </ECC>
+    <Algorithm Comment="" Name="AllOff">
+      <ST Text="red := FALSE;&#10;yellow := FALSE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in stop mode (i.e., red := true, green := false)" Name="Stop">
+      <ST Text="red := TRUE;&#10;yellow := FALSE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in Walk mode (i.e., red := false, green := true)" Name="Go">
+      <ST Text="red := FALSE;&#10;yellow := FALSE;&#10;green := TRUE;"/>
+    </Algorithm>
+    <Algorithm Comment="" Name="setBlinkTimeOut">
+      <ST Text="timeOut.DT := blinkTime;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="ToggleYellow">
+      <ST Text="yellow := NOT yellow;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="Allowing">
+      <ST Text="yellow := TRUE;&#10;timeOut.DT := yellowOnTime;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="stopping">
+      <ST Text="green := FALSE;&#10;yellow := TRUE;&#10;&#10;timeOut.DT := yellowOffTime;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="StartBlinking">
+      <ST Text="&#10;timeOut.DT := blinkTime;&#10;blinkCount := 0;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="ToggleGreen">
+      <ST Text="green := NOT green;&#10;blinkCount := blinkCount + 1;"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/Arrowhead/examples/trafficLight/CarLightCtl_Discrete.fbt b/Arrowhead/Arrowhead/examples/trafficLight/CarLightCtl_Discrete.fbt
new file mode 100644
index 0000000..a208178
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/trafficLight/CarLightCtl_Discrete.fbt
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Function block for controling the operation of a car trafic light following the rules of Germany" Name="CarLightCtl_Discrete">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2014-07-11" Organization="4DIAC-Consortium" Version="0.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="OutOfService" Type="Event"/>
+      <Event Name="Stop" Type="Event"/>
+      <Event Name="Allow" Type="Event"/>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="Stopped" Type="Event"/>
+      <Event Name="Allowed" Type="Event"/>
+      <Event Comment="" Name="UpdateLights" Type="Event">
+        <With Var="green"/>
+        <With Var="red"/>
+        <With Var="yellow"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Cycle time for the yellow light blinking in out of service" Name="yellowBlinkTime" Type="TIME"/>
+      <VarDeclaration Comment="Time the yellow light is on when switching from red to green" Name="yellowOnTime" Type="TIME"/>
+      <VarDeclaration Comment="Time the yellow light is on when swithcing from green to red" Name="yellowOffTime" Type="TIME"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="red" Type="BOOL"/>
+      <VarDeclaration Name="yellow" Type="BOOL"/>
+      <VarDeclaration Comment="" InitialValue="" Name="green" Type="BOOL"/>
+    </OutputVars>
+    <Plugs>
+      <AdapterDeclaration Name="timeOut" Type="ATimeOut"/>
+    </Plugs>
+  </InterfaceList>
+  <BasicFB>
+    <ECC>
+      <ECState Name="START" x="190.0" y="570.0"/>
+      <ECState Name="OutOfService" x="1615.0" y="1235.0">
+        <ECAction Algorithm="setBlinkTimeOut" Output="timeOut.START"/>
+      </ECState>
+      <ECState Name="Block" x="665.0" y="2375.0">
+        <ECAction Algorithm="Stop" Output="UpdateLights"/>
+        <ECAction Output="Stopped"/>
+      </ECState>
+      <ECState Name="State" x="2470.0" y="2375.0">
+        <ECAction Algorithm="Go" Output="UpdateLights"/>
+        <ECAction Output="Allowed"/>
+      </ECState>
+      <ECState Name="ToggleYellow" x="2280.0" y="570.0">
+        <ECAction Algorithm="ToggleYellow" Output="UpdateLights"/>
+      </ECState>
+      <ECState Name="EnteringOoS" x="190.0" y="1235.0">
+        <ECAction Algorithm="AllOff" Output="UpdateLights"/>
+        <ECAction Output="timeOut.STOP"/>
+      </ECState>
+      <ECState Name="Allowing" x="1900.0" y="1710.0">
+        <ECAction Algorithm="Allowing" Output="UpdateLights"/>
+        <ECAction Output="timeOut.START"/>
+      </ECState>
+      <ECState Name="Stopping" x="570.0" y="2945.0">
+        <ECAction Algorithm="stopping" Output="UpdateLights"/>
+        <ECAction Output="timeOut.START"/>
+      </ECState>
+      <ECTransition Comment="" Condition="Stop" Destination="Block" Source="OutOfService" x="1145.0" y="1870.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="ToggleYellow" Source="OutOfService" x="1925.0" y="910.0"/>
+      <ECTransition Comment="" Condition="1" Destination="OutOfService" Source="ToggleYellow" x="2375.0" y="1005.0"/>
+      <ECTransition Comment="" Condition="OutOfService" Destination="EnteringOoS" Source="START" x="300.0" y="950.0"/>
+      <ECTransition Comment="" Condition="OutOfService" Destination="EnteringOoS" Source="Block" x="360.0" y="1985.0"/>
+      <ECTransition Comment="" Condition="OutOfService" Destination="EnteringOoS" Source="State" x="1075.0" y="3600.0"/>
+      <ECTransition Comment="" Condition="1" Destination="OutOfService" Source="EnteringOoS" x="1040.0" y="1040.0"/>
+      <ECTransition Comment="" Condition="Allow" Destination="Allowing" Source="Block" x="1675.0" y="2115.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="State" Source="Allowing" x="2305.0" y="2120.0"/>
+      <ECTransition Comment="" Condition="Stop" Destination="Stopping" Source="State" x="2060.0" y="2615.0"/>
+      <ECTransition Comment="" Condition="OutOfService" Destination="EnteringOoS" Source="Stopping" x="380.0" y="1985.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="Block" Source="Stopping" x="775.0" y="2735.0"/>
+      <ECTransition Comment="" Condition="OutOfService" Destination="EnteringOoS" Source="Allowing" x="395.0" y="1985.0"/>
+    </ECC>
+    <Algorithm Comment="" Name="AllOff">
+      <ST Text="red := FALSE;&#10;yellow := FALSE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in stop mode (i.e., red := true, green := false)" Name="Stop">
+      <ST Text="red := TRUE;&#10;yellow := FALSE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in Walk mode (i.e., red := false, green := true)" Name="Go">
+      <ST Text="red := FALSE;&#10;yellow := FALSE;&#10;green := TRUE;"/>
+    </Algorithm>
+    <Algorithm Comment="" Name="setBlinkTimeOut">
+      <ST Text="timeOut.DT := yellowBlinkTime;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="ToggleYellow">
+      <ST Text="yellow := NOT yellow;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="Allowing">
+      <ST Text="yellow := TRUE;&#10;timeOut.DT := yellowOnTime;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="stopping">
+      <ST Text="green := FALSE;&#10;yellow := TRUE;&#10;&#10;timeOut.DT := yellowOffTime;"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/Arrowhead/examples/trafficLight/PedCrossingCtl.fbt b/Arrowhead/Arrowhead/examples/trafficLight/PedCrossingCtl.fbt
new file mode 100644
index 0000000..ba6e79d
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/trafficLight/PedCrossingCtl.fbt
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Basic Function Block Type" Name="PedCrossingCtl">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2014-07-14" Organization="4DIAC-Consortium" Version="0.0"/>
+  <CompilerInfo/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Initialization Request" Name="INIT" Type="Event"/>
+      <Event Comment="" Name="UpdateEnabled" Type="Event">
+        <With Var="enabled"/>
+      </Event>
+      <Event Comment="" Name="PedRequest" Type="Event"/>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="" Name="INITO" Type="Event"/>
+      <Event Comment="" Name="UpdatePedReq" Type="Event">
+        <With Var="pedRequestPending"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="determines if this crossing is enabled, if currently the pedestrian walk is green the pedestrian cycle will be finished before a full disable of the crossing is performed" Name="enabled" Type="BOOL"/>
+      <VarDeclaration Comment="" Name="PedRequestDelay" Type="TIME"/>
+      <VarDeclaration Comment="" Name="PedOnTime" Type="TIME"/>
+      <VarDeclaration Comment="" Name="PedCarInterleave" Type="TIME"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="" Name="pedRequestPending" Type="BOOL"/>
+    </OutputVars>
+    <Plugs>
+      <AdapterDeclaration Comment="" Name="CarLight" Type="ATraficLight"/>
+      <AdapterDeclaration Comment="" Name="PedLight" Type="ATraficLight"/>
+      <AdapterDeclaration Comment="" Name="timeOut" Type="ATimeOut"/>
+    </Plugs>
+  </InterfaceList>
+  <BasicFB>
+    <ECC>
+      <ECState Comment="Initial State" Name="START" x="550.0" y="425.0"/>
+      <ECState Comment="Initialization" Name="Disabled" x="1235.0" y="1045.0">
+        <ECAction Output="PedLight.OutOfService"/>
+        <ECAction Output="CarLight.OutOfService"/>
+      </ECState>
+      <ECState Comment="" Name="Stopped" x="3040.0" y="1045.0">
+        <ECAction Output="PedLight.Stop"/>
+      </ECState>
+      <ECState Comment="" Name="StartCar" x="3040.0" y="1995.0">
+        <ECAction Output="CarLight.Allow"/>
+      </ECState>
+      <ECState Comment="" Name="Enabled" x="1900.0" y="1995.0"/>
+      <ECState Comment="" Name="PedRequest" x="1900.0" y="2375.0">
+        <ECAction Algorithm="setPedRequestDelay" Output="timeOut.START"/>
+        <ECAction Algorithm="setPedRequest" Output="UpdatePedReq"/>
+      </ECState>
+      <ECState Comment="" Name="StopCar" x="1900.0" y="2755.0">
+        <ECAction Output="CarLight.Stop"/>
+      </ECState>
+      <ECState Comment="" Name="StartPed" x="1900.0" y="3610.0">
+        <ECAction Output="PedLight.Allow"/>
+      </ECState>
+      <ECState Comment="" Name="WaitOnTime" x="1900.0" y="3990.0">
+        <ECAction Algorithm="setPedLightOnDelay" Output="timeOut.START"/>
+        <ECAction Algorithm="clearPedRequest" Output="UpdatePedReq"/>
+      </ECState>
+      <ECState Comment="" Name="CarPedSaftyTime" x="1900.0" y="3135.0">
+        <ECAction Algorithm="setPedCarInterleaveTimeOut" Output="timeOut.START"/>
+      </ECState>
+      <ECState Comment="" Name="PedCarSafetyTime" x="2565.0" y="1615.0">
+        <ECAction Algorithm="setPedCarInterleaveTimeOut" Output="timeOut.START"/>
+      </ECState>
+      <ECState Comment="" Name="Initilalize" x="1330.0" y="380.0">
+        <ECAction Output="INITO"/>
+      </ECState>
+      <ECState Comment="" Name="State" x="0.0" y="1900.0">
+        <ECAction Algorithm="clearPedRequest" Output="UpdatePedReq"/>
+        <ECAction Output="timeOut.STOP"/>
+      </ECState>
+      <ECTransition Comment="" Condition="UpdateEnabled[enabled]" Destination="Stopped" Source="Disabled" x="2185.0" y="855.0"/>
+      <ECTransition Comment="" Condition="CarLight.Allowed" Destination="Enabled" Source="StartCar" x="2600.0" y="2070.0"/>
+      <ECTransition Comment="" Condition="[NOT enabled]" Destination="Disabled" Source="Enabled" x="1655.0" y="1765.0"/>
+      <ECTransition Comment="" Condition="PedRequest" Destination="PedRequest" Source="Enabled" x="2115.0" y="2245.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="StopCar" Source="PedRequest" x="2130.0" y="2570.0"/>
+      <ECTransition Comment="" Condition="PedLight.Allowed" Destination="WaitOnTime" Source="StartPed" x="2060.0" y="3805.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="Stopped" Source="WaitOnTime" x="5470.0" y="2425.0"/>
+      <ECTransition Comment="" Condition="CarLight.Stopped" Destination="CarPedSaftyTime" Source="StopCar" x="2145.0" y="3025.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="StartPed" Source="CarPedSaftyTime" x="2155.0" y="3410.0"/>
+      <ECTransition Comment="" Condition="PedLight.Stopped" Destination="PedCarSafetyTime" Source="Stopped" x="3130.0" y="1390.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="StartCar" Source="PedCarSafetyTime" x="3210.0" y="1855.0"/>
+      <ECTransition Comment="" Condition="INIT" Destination="Initilalize" Source="START" x="975.0" y="445.0"/>
+      <ECTransition Comment="" Condition="1" Destination="Disabled" Source="Initilalize" x="1370.0" y="740.0"/>
+      <ECTransition Comment="" Condition="[NOT enabled]" Destination="State" Source="PedRequest" x="320.0" y="2335.0"/>
+      <ECTransition Comment="" Condition="1" Destination="Disabled" Source="State" x="565.0" y="1375.0"/>
+    </ECC>
+    <Algorithm Comment="Initialization algorithm" Name="setPedRequestDelay">
+      <ST Text="timeOut.DT := PedRequestDelay;"/>
+    </Algorithm>
+    <Algorithm Comment="Normally executed algorithm" Name="setPedLightOnDelay">
+      <ST Text="timeOut.DT := PedOnTime;"/>
+    </Algorithm>
+    <Algorithm Comment="" Name="setPedCarInterleaveTimeOut">
+      <ST Text="timeOut.DT := PedCarInterleave;"/>
+    </Algorithm>
+    <Algorithm Comment="set the ped Requst pending bit to true" Name="setPedRequest">
+      <ST Text="pedRequestPending := TRUE;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="clearPedRequest">
+      <ST Text="pedRequestPending := FALSE;"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/Arrowhead/examples/trafficLight/PedLightCtl.fbt b/Arrowhead/Arrowhead/examples/trafficLight/PedLightCtl.fbt
new file mode 100644
index 0000000..a8a139b
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/trafficLight/PedLightCtl.fbt
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Function block for controling the operation of a pedestrian trafic light with one red and one green light" Name="PedLightCtl">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2014-07-11" Organization="4DIAC-Consortium" Version="0.0"/>
+  <InterfaceList>
+    <EventInputs/>
+    <EventOutputs>
+      <Event Comment="" Name="UpdateLights" Type="Event">
+        <With Var="green"/>
+        <With Var="red"/>
+      </Event>
+    </EventOutputs>
+    <InputVars/>
+    <OutputVars>
+      <VarDeclaration Comment="" InitialValue="" Name="red" Type="BOOL"/>
+      <VarDeclaration Comment="" InitialValue="" Name="green" Type="BOOL"/>
+    </OutputVars>
+    <Sockets>
+      <AdapterDeclaration Name="traficLight" Type="ATraficLight"/>
+    </Sockets>
+  </InterfaceList>
+  <BasicFB>
+    <ECC>
+      <ECState Name="OutOfService" x="1615.0" y="1235.0">
+        <ECAction Algorithm="AllOff" Output="UpdateLights"/>
+      </ECState>
+      <ECState Name="Block" x="1140.0" y="2375.0">
+        <ECAction Algorithm="Stop" Output="UpdateLights"/>
+        <ECAction Output="traficLight.Stopped"/>
+      </ECState>
+      <ECState Name="State" x="2755.0" y="2375.0">
+        <ECAction Algorithm="Go" Output="UpdateLights"/>
+        <ECAction Output="traficLight.Allowed"/>
+      </ECState>
+      <ECTransition Comment="" Condition="traficLight.Stop" Destination="Block" Source="OutOfService" x="975.0" y="1695.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="OutOfService" Source="Block" x="1560.0" y="1895.0"/>
+      <ECTransition Comment="" Condition="traficLight.Allow" Destination="State" Source="Block" x="1960.0" y="2185.0"/>
+      <ECTransition Comment="" Condition="traficLight.Stop" Destination="Block" Source="State" x="1640.0" y="2960.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="OutOfService" Source="State" x="2335.0" y="1800.0"/>
+      <ECTransition Comment="" Condition="traficLight.Allow" Destination="State" Source="OutOfService" x="2805.0" y="1705.0"/>
+    </ECC>
+    <Algorithm Comment="" Name="AllOff">
+      <ST Text="red := FALSE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in stop mode (i.e., red := true, green := false)" Name="Stop">
+      <ST Text="red := TRUE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in Walk mode (i.e., red := false, green := true)" Name="Go">
+      <ST Text="red := FALSE;&#10;green := TRUE;"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/Arrowhead/examples/trafficLight/PedLightCtl_AT.fbt b/Arrowhead/Arrowhead/examples/trafficLight/PedLightCtl_AT.fbt
new file mode 100644
index 0000000..a46641f
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/trafficLight/PedLightCtl_AT.fbt
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Function block for controling the operation of a pedestrian trafic light with one red and one green light" Name="PedLightCtl_AT">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2014-07-11" Organization="4DIAC-Consortium" Version="0.0"/>
+  <CompilerInfo/>
+  <InterfaceList>
+    <EventOutputs>
+      <Event Comment="" Name="UpdateLights" Type="Event">
+        <With Var="green"/>
+        <With Var="red"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="" Name="blinkTime" Type="TIME"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="" InitialValue="" Name="red" Type="BOOL"/>
+      <VarDeclaration Comment="" InitialValue="" Name="green" Type="BOOL"/>
+    </OutputVars>
+    <Plugs>
+      <AdapterDeclaration Comment="" Name="timeOut" Type="ATimeOut"/>
+    </Plugs>
+    <Sockets>
+      <AdapterDeclaration Comment="" Name="traficLight" Type="ATraficLight"/>
+    </Sockets>
+  </InterfaceList>
+  <BasicFB>
+    <InternalVars>
+      <VarDeclaration Comment="Internal Variable" Name="blinkCount" Type="UINT"/>
+    </InternalVars>
+    <ECC>
+      <ECState Comment="" Name="OutOfService" x="1615.0" y="1235.0">
+        <ECAction Algorithm="AllOff" Output="UpdateLights"/>
+      </ECState>
+      <ECState Comment="" Name="Block" x="1140.0" y="2375.0">
+        <ECAction Algorithm="Stop" Output="UpdateLights"/>
+        <ECAction Output="traficLight.Stopped"/>
+      </ECState>
+      <ECState Comment="" Name="Allowed" x="2755.0" y="2375.0">
+        <ECAction Algorithm="Go" Output="UpdateLights"/>
+        <ECAction Output="traficLight.Allowed"/>
+      </ECState>
+      <ECState Comment="" Name="State" x="2660.0" y="3230.0">
+        <ECAction Algorithm="StartBlinking" Output="UpdateLights"/>
+        <ECAction Output="timeOut.START"/>
+      </ECState>
+      <ECState Comment="" Name="State_0" x="1805.0" y="3705.0">
+        <ECAction Algorithm="ToggleGreen" Output="UpdateLights"/>
+        <ECAction Output="timeOut.START"/>
+      </ECState>
+      <ECTransition Comment="" Condition="traficLight.Stop" Destination="Block" Source="OutOfService" x="450.0" y="1670.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="OutOfService" Source="Block" x="1560.0" y="1895.0"/>
+      <ECTransition Comment="" Condition="traficLight.Allow" Destination="Allowed" Source="Block" x="1960.0" y="2185.0"/>
+      <ECTransition Comment="" Condition="traficLight.OutOfService" Destination="OutOfService" Source="Allowed" x="2335.0" y="1800.0"/>
+      <ECTransition Comment="" Condition="traficLight.Allow" Destination="Allowed" Source="OutOfService" x="3810.0" y="1695.0"/>
+      <ECTransition Comment="" Condition="traficLight.Stop" Destination="State" Source="Allowed" x="2845.0" y="2785.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="State_0" Source="State" x="2310.0" y="3505.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut[blinkCount = 10]" Destination="Block" Source="State_0" x="1535.0" y="3080.0"/>
+      <ECTransition Comment="" Condition="timeOut.TimeOut" Destination="State_0" Source="State_0" x="1890.0" y="3980.0"/>
+    </ECC>
+    <Algorithm Comment="" Name="AllOff">
+      <ST Text="red := FALSE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in stop mode (i.e., red := true, green := false)" Name="Stop">
+      <ST Text="red := TRUE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in Walk mode (i.e., red := false, green := true)" Name="Go">
+      <ST Text="red := FALSE;&#10;green := TRUE;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="StartBlinking">
+      <ST Text="&#10;timeOut.DT := blinkTime;&#10;blinkCount := 0;&#10;green := FALSE;&#10;"/>
+    </Algorithm>
+    <Algorithm Comment="new algorithm" Name="ToggleGreen">
+      <ST Text="&#10;green := NOT green;&#10;blinkCount := blinkCount + 1;&#10;"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/Arrowhead/examples/trafficLight/PedLightCtl_Discrete.fbt b/Arrowhead/Arrowhead/examples/trafficLight/PedLightCtl_Discrete.fbt
new file mode 100644
index 0000000..9c42033
--- /dev/null
+++ b/Arrowhead/Arrowhead/examples/trafficLight/PedLightCtl_Discrete.fbt
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Function block for controling the operation of a pedestrian trafic light with one red and one green light" Name="PedLightCtl_Discrete">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2014-07-11" Organization="4DIAC-Consortium" Version="0.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="OutOfService" Type="Event"/>
+      <Event Name="Stop" Type="Event"/>
+      <Event Name="Allow" Type="Event"/>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="Stopped" Type="Event"/>
+      <Event Name="Allowed" Type="Event"/>
+      <Event Comment="" Name="UpdateLights" Type="Event">
+        <With Var="green"/>
+        <With Var="red"/>
+      </Event>
+    </EventOutputs>
+    <InputVars/>
+    <OutputVars>
+      <VarDeclaration Name="red" Type="BOOL"/>
+      <VarDeclaration Comment="" InitialValue="" Name="green" Type="BOOL"/>
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC>
+      <ECState Name="OutOfService" x="1615.0" y="1235.0">
+        <ECAction Algorithm="AllOff" Output="UpdateLights"/>
+      </ECState>
+      <ECState Name="Block" x="1140.0" y="2375.0">
+        <ECAction Algorithm="Stop" Output="UpdateLights"/>
+        <ECAction Output="Stopped"/>
+      </ECState>
+      <ECState Name="State" x="2470.0" y="2375.0">
+        <ECAction Algorithm="Go" Output="UpdateLights"/>
+        <ECAction Output="Allowed"/>
+      </ECState>
+      <ECTransition Comment="" Condition="Stop" Destination="Block" Source="OutOfService" x="965.0" y="1815.0"/>
+      <ECTransition Comment="" Condition="OutOfService" Destination="OutOfService" Source="Block" x="1560.0" y="1895.0"/>
+      <ECTransition Comment="" Condition="Allow" Destination="State" Source="Block" x="1960.0" y="2185.0"/>
+      <ECTransition Comment="" Condition="Stop" Destination="Block" Source="State" x="1750.0" y="2895.0"/>
+      <ECTransition Comment="" Condition="OutOfService" Destination="OutOfService" Source="State" x="2205.0" y="1890.0"/>
+      <ECTransition Comment="" Condition="Allow" Destination="State" Source="OutOfService" x="2625.0" y="1830.0"/>
+    </ECC>
+    <Algorithm Comment="" Name="AllOff">
+      <ST Text="red := FALSE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in stop mode (i.e., red := true, green := false)" Name="Stop">
+      <ST Text="red := TRUE;&#10;green := FALSE;"/>
+    </Algorithm>
+    <Algorithm Comment="Put lights in Walk mode (i.e., red := false, green := true)" Name="Go">
+      <ST Text="red := FALSE;&#10;green := TRUE;"/>
+    </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/ArrowheadTests.sys b/Arrowhead/ArrowheadTests.sys
index 9370568..c49d60d 100644
--- a/Arrowhead/ArrowheadTests.sys
+++ b/Arrowhead/ArrowheadTests.sys
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE System SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
 <System Comment="" Name="ArrowheadTests">
-  <VersionInfo Author="Jose Cabral" Date="2019-03-06" Organization="fortiss GmbH" Version="1.0"/>
+  <VersionInfo Author="Author" Organization="Eclipse 4diac" Version="1.0"/>
   <Application Comment="" Name="HTTPTest1RegisterUnregister">
     <SubAppNetwork>
-      <FB Comment="" Name="QueryService" Type="QueryService" x="7655.0" y="-180.0">
+      <FB Comment="" Name="QueryService" Type="QueryService" x="7650.0" y="-175.0">
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </FB>
-      <FB Comment="" Name="QueryServiceHTTP" Type="QueryServiceHTTP" x="9550.0" y="1625.0"/>
-      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="9625.0" y="50.0">
+      <FB Comment="" Name="QueryServiceHTTP" Type="QueryServiceHTTP" x="9545.0" y="1620.0"/>
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="9620.0" y="45.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="F_EQ" Type="F_EQ" x="15930.0" y="2015.0">
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="15925.0" y="2010.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="ServiceNotRegisteredPos1" Type="TEST_CONDITION" x="17295.0" y="2075.0"/>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="11360.0" y="-30.0"/>
-      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="2415.0" y="-1160.0">
+      <FB Comment="" Name="ServiceNotRegisteredPos1" Type="TEST_CONDITION" x="17290.0" y="2070.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="11355.0" y="-25.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="2410.0" y="-1155.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <FB Comment="" Name="FieldsToServiceQueryForm" Type="FieldsToServiceQueryForm" x="5290.0" y="-1180.0">
+      <FB Comment="" Name="FieldsToServiceQueryForm" Type="FieldsToServiceQueryForm" x="5285.0" y="-1175.0">
         <Parameter Name="version" Value="%serviceVersion%"/>
       </FB>
-      <FB Comment="" Name="Registered" Type="E_SR" x="13280.0" y="2160.0"/>
-      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="14235.0" y="2085.0"/>
-      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="15930.0" y="2730.0">
+      <FB Comment="" Name="Registered" Type="E_SR" x="13275.0" y="2155.0"/>
+      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="14230.0" y="2080.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="15925.0" y="2725.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="ServiceRegisteredPos0" Type="TEST_CONDITION" x="17295.0" y="2645.0"/>
-      <SubApp Comment="" Name="Sequencer" x="755.0" y="4130.0">
+      <FB Comment="" Name="ServiceRegisteredPos0" Type="TEST_CONDITION" x="17290.0" y="2640.0"/>
+      <SubApp Comment="" Name="Sequencer" x="750.0" y="4125.0">
         <SubAppInterfaceList>
           <SubAppEventInputs>
             <SubAppEvent Comment="" Name="Next" Type="Event"/>
@@ -47,162 +47,163 @@
           </SubAppEventOutputs>
         </SubAppInterfaceList>
         <SubAppNetwork>
-          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4240.0" y="150.0"/>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
           <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
-          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="4180.0" y="2665.0"/>
-          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3080.0" y="1370.0"/>
-          <FB Comment="" Name="F_GT" Type="F_GT" x="2235.0" y="1365.0">
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="4175.0" y="2660.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
             <Parameter Name="IN2" Value="INT#3"/>
           </FB>
-          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="5005.0" y="1330.0"/>
-          <FB Comment="" Name="F_SUB" Type="F_SUB" x="2455.0" y="2355.0">
+          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="5000.0" y="1325.0"/>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="2450.0" y="2350.0">
             <Parameter Name="IN2" Value="INT#4"/>
           </FB>
-          <DataConnections>
-            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1665.0"/>
-            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="150.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="670.0"/>
-            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="355.0"/>
-            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="250.0"/>
-          </DataConnections>
           <EventConnections>
-            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="695.0"/>
-            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="695.0"/>
-            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="695.0"/>
-            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="695.0"/>
-            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="755.0"/>
-            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="755.0"/>
-            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="755.0"/>
-            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="755.0"/>
-            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="150.0"/>
-            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="155.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="415.0" dx2="60.0" dy="-1430.0"/>
-            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH.EO1" dx1="60.0" dx2="60.0" dy="575.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="765.0"/>
-            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1.EO3" dx1="305.0" dx2="60.0" dy="620.0"/>
-            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1015.0"/>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="410.0" dx2="55.0" dy="-1425.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="570.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1.EO3" dx1="300.0" dx2="55.0" dy="615.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
             <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="200.0"/>
             <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="200.0"/>
             <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="200.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="170.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="165.0"/>
           </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+          </DataConnections>
         </SubAppNetwork>
       </SubApp>
-      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="2855.0" y="770.0">
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="2850.0" y="765.0">
         <Parameter Name="systemName" Value="%systemName%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
       </FB>
-      <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="5620.0" y="745.0">
+      <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="5615.0" y="740.0">
         <Parameter Name="serviceURI" Value="%serviceURI%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
       </FB>
-      <FB Comment="" Name="RegisterService" Type="RegisterService" x="8700.0" y="2810.0">
+      <FB Comment="" Name="RegisterService" Type="RegisterService" x="8700.0" y="2805.0">
         <Parameter Name="endpoint" Value="%serviceRegistryAddress%"/>
       </FB>
-      <FB Comment="" Name="RegisterServiceHTTP" Type="RegisterServiceHTTP" x="10490.0" y="3275.0"/>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="11355.0" y="945.0"/>
-      <FB Comment="" Name="ServiceNotRegisteredPos0" Type="TEST_CONDITION" x="17145.0" y="1310.0"/>
-      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="9560.0" y="935.0">
+      <FB Comment="" Name="RegisterServiceHTTP" Type="RegisterServiceHTTP" x="10485.0" y="3270.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="11350.0" y="940.0"/>
+      <FB Comment="" Name="ServiceNotRegisteredPos0" Type="TEST_CONDITION" x="17140.0" y="1305.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="9555.0" y="930.0">
         <Parameter Name="INDEX" Value="1"/>
       </FB>
       <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="15900.0" y="1300.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="PUBLISH_0" Type="PUBL_0" x="14130.0" y="4170.0">
+      <FB Comment="" Name="PUBLISH_0" Type="PUBL_0" x="5500.0" y="4800.0">
         <Parameter Name="ID" Value="%firstResourceReady%"/>
       </FB>
-      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="1140.0" y="-1280.0">
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="1135.0" y="-1275.0">
         <Parameter Name="ID" Value="%cleanFinished%"/>
       </FB>
-      <DataConnections>
-        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="270.0"/>
-        <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="640.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="470.0"/>
-        <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="265.0"/>
-        <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="260.0"/>
-        <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="490.0"/>
-        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2150.0"/>
-        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="650.0"/>
-        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="525.0"/>
-        <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="665.0"/>
-        <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="490.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="350.0"/>
-        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2670.0"/>
-        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="1575.0"/>
-      </DataConnections>
       <EventConnections>
-        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService.queried" dx1="380.0"/>
-        <Connection Comment="" Destination="ServiceNotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="640.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="785.0"/>
-        <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="265.0"/>
-        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="1300.0"/>
-        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="510.0"/>
-        <Connection Comment="" Destination="ServiceRegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="490.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="755.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneUnregister" dx1="250.0" dx2="60.0" dy="-980.0"/>
-        <Connection Comment="" Destination="Registered.R" Source="RegisterService.doneUnregister" dx1="1865.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneRegister" dx1="60.0" dx2="60.0" dy="-810.0"/>
-        <Connection Comment="" Destination="Registered.S" Source="RegisterService.doneRegister" dx1="1720.0"/>
-        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="950.0"/>
-        <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService.queried" dx1="375.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="635.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="780.0"/>
+        <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="260.0"/>
+        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="1120.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="505.0"/>
+        <Connection Comment="" Destination="ServiceRegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="485.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceRegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="750.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneUnregister" dx1="245.0" dx2="55.0" dy="-975.0"/>
+        <Connection Comment="" Destination="Registered.R" Source="RegisterService.doneUnregister" dx1="1860.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneRegister" dx1="55.0" dx2="55.0" dy="-805.0"/>
+        <Connection Comment="" Destination="Registered.S" Source="RegisterService.doneRegister" dx1="1715.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="945.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="435.0"/>
         <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="600.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="350.0"/>
-        <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO0" dx1="290.0"/>
-        <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="2305.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceNotRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="-3220.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToServiceQueryForm.CNF" dx1="60.0" dx2="60.0" dy="985.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToServiceRegistryEntry.CNF" dx1="205.0" dx2="60.0" dy="2640.0"/>
-        <Connection Comment="" Destination="PUBLISH_0.INIT" Source="Sequencer.E5" dx1="7320.0"/>
-        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E4" dx1="1210.0"/>
-        <Connection Comment="" Destination="RegisterService.unregister" Source="Sequencer.E3" dx1="860.0"/>
-        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E2" dx1="540.0"/>
-        <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E1" dx1="360.0"/>
-        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E0" dx1="160.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="SUBL_0.IND" dx1="420.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="345.0"/>
+        <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO0" dx1="285.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="2300.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceNotRegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="-3215.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToServiceQueryForm.CNF" dx1="55.0" dx2="55.0" dy="980.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToServiceRegistryEntry.CNF" dx1="200.0" dx2="55.0" dy="2635.0"/>
+        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E4" dx1="1205.0"/>
+        <Connection Comment="" Destination="RegisterService.unregister" Source="Sequencer.E3" dx1="855.0"/>
+        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E2" dx1="535.0"/>
+        <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E1" dx1="355.0"/>
+        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E0" dx1="155.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="SUBL_0.IND" dx1="415.0"/>
+        <Connection Comment="" Destination="PUBLISH_0.REQ" Source="Sequencer.E5" dx1="3990.0"/>
+        <Connection Comment="" Destination="PUBLISH_0.INIT" Source="SUBL_0.INITO" dx1="3805.0"/>
       </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="265.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="635.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="465.0"/>
+        <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="260.0"/>
+        <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="255.0"/>
+        <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="485.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2145.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="645.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="520.0"/>
+        <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="660.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="485.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="345.0"/>
+        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2665.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="1570.0"/>
+      </DataConnections>
       <AdapterConnections>
-        <Connection Comment="" Destination="QueryServiceHTTP.queryServices" Source="QueryService.queryServices" dx1="180.0"/>
-        <Connection Comment="" Destination="RegisterServiceHTTP.registerService" Source="RegisterService.registerService" dx1="245.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTP.queryServices" Source="QueryService.queryServices" dx1="175.0"/>
+        <Connection Comment="" Destination="RegisterServiceHTTP.registerService" Source="RegisterService.registerService" dx1="60.0" dx2="60.0" dy="130.0"/>
       </AdapterConnections>
     </SubAppNetwork>
   </Application>
   <Application Comment="" Name="HTTPTest2DoubleRegister">
     <SubAppNetwork>
-      <FB Comment="" Name="QueryService" Type="QueryService" x="8850.0" y="1040.0">
+      <FB Comment="" Name="QueryService" Type="QueryService" x="8845.0" y="1035.0">
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </FB>
-      <FB Comment="" Name="QueryServiceHTTP" Type="QueryServiceHTTP" x="10745.0" y="2065.0"/>
-      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="10795.0" y="170.0">
+      <FB Comment="" Name="QueryServiceHTTP" Type="QueryServiceHTTP" x="10740.0" y="2060.0"/>
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="10790.0" y="165.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="F_EQ" Type="F_EQ" x="17125.0" y="2455.0">
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="17120.0" y="2450.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="ServiceNotRegisteredPos1" Type="TEST_CONDITION" x="18490.0" y="2515.0"/>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="12550.0" y="185.0"/>
-      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="3925.0" y="-1510.0">
+      <FB Comment="" Name="ServiceNotRegisteredPos1" Type="TEST_CONDITION" x="18485.0" y="2510.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="12545.0" y="180.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="3920.0" y="-1505.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <FB Comment="" Name="FieldsToServiceQueryForm" Type="FieldsToServiceQueryForm" x="6795.0" y="-1400.0">
+      <FB Comment="" Name="FieldsToServiceQueryForm" Type="FieldsToServiceQueryForm" x="6790.0" y="-1400.0">
         <Parameter Name="version" Value="%serviceVersion%"/>
       </FB>
-      <FB Comment="" Name="Registered" Type="E_SR" x="14475.0" y="2600.0"/>
-      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="15430.0" y="2525.0"/>
-      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="17125.0" y="3170.0">
+      <FB Comment="" Name="Registered" Type="E_SR" x="14470.0" y="2600.0"/>
+      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="15425.0" y="2520.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="17120.0" y="3165.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="ServiceRegisteredPos0" Type="TEST_CONDITION" x="18490.0" y="3085.0"/>
-      <SubApp Comment="" Name="Sequencer" x="1950.0" y="4570.0">
+      <FB Comment="" Name="ServiceRegisteredPos0" Type="TEST_CONDITION" x="18485.0" y="3080.0"/>
+      <SubApp Comment="" Name="Sequencer" x="1945.0" y="4565.0">
         <SubAppInterfaceList>
           <SubAppEventInputs>
             <SubAppEvent Comment="" Name="Next" Type="Event"/>
@@ -219,164 +220,164 @@
           </SubAppEventOutputs>
         </SubAppInterfaceList>
         <SubAppNetwork>
-          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4240.0" y="150.0"/>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
           <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
-          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="4180.0" y="2665.0"/>
-          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3080.0" y="1370.0"/>
-          <FB Comment="" Name="F_GT" Type="F_GT" x="2235.0" y="1365.0">
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="4175.0" y="2660.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
             <Parameter Name="IN2" Value="INT#3"/>
           </FB>
-          <FB Comment="" Name="F_SUB" Type="F_SUB" x="2455.0" y="2355.0">
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="2450.0" y="2350.0">
             <Parameter Name="IN2" Value="INT#4"/>
           </FB>
-          <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="4960.0" y="830.0"/>
-          <DataConnections>
-            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1665.0"/>
-            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="150.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="670.0"/>
-            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="355.0"/>
-            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="250.0"/>
-          </DataConnections>
+          <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="4955.0" y="825.0"/>
           <EventConnections>
-            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="725.0"/>
-            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="725.0"/>
-            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="755.0"/>
-            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="755.0"/>
-            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="755.0"/>
-            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="755.0"/>
-            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="230.0"/>
-            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH.EO1" dx1="60.0" dx2="60.0" dy="575.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="765.0"/>
-            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1.EO3" dx1="305.0" dx2="60.0" dy="620.0"/>
-            <Connection Comment="" Destination="E_MERGE_1.EI2" Source="E_DEMUX_1.EO1" dx1="130.0"/>
-            <Connection Comment="" Destination="E_MERGE_1.EI2" Source="E_DEMUX_1.EO2" dx1="130.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE_1.EO" dx1="60.0" dx2="60.0" dy="-790.0"/>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="720.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="720.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="570.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1.EO3" dx1="300.0" dx2="55.0" dy="615.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI2" Source="E_DEMUX_1.EO1" dx1="125.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI2" Source="E_DEMUX_1.EO2" dx1="125.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE_1.EO" dx1="55.0" dx2="55.0" dy="-785.0"/>
             <Connection Comment="" Destination="E_MERGE_1.EI1" Source="E_DEMUX.EO2" dx1="200.0"/>
             <Connection Comment="" Destination="E_MERGE_1.EI1" Source="E_DEMUX.EO1" dx1="200.0"/>
             <Connection Comment="" Destination="E_MERGE_1.EI1" Source="E_DEMUX.EO0" dx1="200.0"/>
-            <Connection Comment="" Destination="E_MERGE_1.EI2" Source="E_DEMUX_1.EO0" dx1="130.0"/>
-            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1015.0"/>
-            <Connection Comment="" Destination="E_MERGE_1.EI1" Source="E_DEMUX.EO3" dx1="205.0"/>
-            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="155.0"/>
-            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="725.0"/>
-            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="725.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI2" Source="E_DEMUX_1.EO0" dx1="125.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI1" Source="E_DEMUX.EO3" dx1="200.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="720.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="720.0"/>
           </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+          </DataConnections>
         </SubAppNetwork>
       </SubApp>
-      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="4010.0" y="-225.0">
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="4005.0" y="-220.0">
         <Parameter Name="systemName" Value="%systemName%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
       </FB>
-      <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="6675.0" y="-200.0">
+      <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="6670.0" y="-200.0">
         <Parameter Name="serviceURI" Value="%serviceURI%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
       </FB>
-      <FB Comment="" Name="RegisterService" Type="RegisterService" x="9895.0" y="3250.0">
+      <FB Comment="" Name="RegisterService" Type="RegisterService" x="9890.0" y="3245.0">
         <Parameter Name="endpoint" Value="%serviceRegistryAddress%"/>
       </FB>
-      <FB Comment="" Name="RegisterServiceHTTP" Type="RegisterServiceHTTP" x="11685.0" y="3715.0"/>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="12530.0" y="1005.0"/>
-      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="10775.0" y="990.0">
+      <FB Comment="" Name="RegisterServiceHTTP" Type="RegisterServiceHTTP" x="11680.0" y="3710.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="12525.0" y="1000.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="10770.0" y="985.0">
         <Parameter Name="INDEX" Value="1"/>
       </FB>
-      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="17115.0" y="1775.0">
+      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="17110.0" y="1770.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="ServiceNotRegisteredPos0" Type="TEST_CONDITION" x="18480.0" y="1835.0"/>
-      <FB Comment="" Name="SUBSCRIBE_0" Type="SUBL_0" x="-850.0" y="-1675.0">
+      <FB Comment="" Name="ServiceNotRegisteredPos0" Type="TEST_CONDITION" x="18475.0" y="1830.0"/>
+      <FB Comment="" Name="SUBSCRIBE_0" Type="SUBL_0" x="-845.0" y="-1670.0">
         <Parameter Name="ID" Value="%firstResourceReady%"/>
       </FB>
-      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="5595.0" y="5660.0">
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="5590.0" y="5655.0">
         <Parameter Name="ID" Value="%secondResourceReady%"/>
       </FB>
-      <DataConnections>
-        <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="490.0"/>
-        <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="665.0"/>
-        <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="470.0"/>
-        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2150.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="525.0"/>
-        <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="260.0"/>
-        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="650.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="505.0"/>
-        <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="640.0"/>
-        <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="265.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="365.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2670.0"/>
-        <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="490.0"/>
-        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2470.0"/>
-      </DataConnections>
       <EventConnections>
-        <Connection Comment="" Destination="ServiceRegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="490.0"/>
-        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="510.0"/>
-        <Connection Comment="" Destination="ServiceNotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="640.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService.queried" dx1="380.0"/>
-        <Connection Comment="" Destination="Registered.R" Source="RegisterService.doneUnregister" dx1="1865.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="785.0"/>
-        <Connection Comment="" Destination="Registered.S" Source="RegisterService.doneRegister" dx1="1720.0"/>
-        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="1300.0"/>
-        <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="265.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="755.0"/>
-        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="950.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="365.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="580.0"/>
-        <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO0" dx1="290.0"/>
-        <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="490.0"/>
-        <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="2765.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceNotRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="-3760.0"/>
+        <Connection Comment="" Destination="ServiceRegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="485.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="505.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="635.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService.queried" dx1="375.0"/>
+        <Connection Comment="" Destination="Registered.R" Source="RegisterService.doneUnregister" dx1="1860.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="550.0"/>
+        <Connection Comment="" Destination="Registered.S" Source="RegisterService.doneRegister" dx1="1715.0"/>
+        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="1130.0"/>
+        <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="260.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceRegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="750.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="945.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="360.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="550.0"/>
+        <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO0" dx1="285.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="485.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="2760.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceNotRegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="-3755.0"/>
         <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E0" dx1="600.0"/>
-        <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E1" dx1="830.0"/>
-        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E2" dx1="1020.0"/>
-        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E4" dx1="1650.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="2385.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="SUBSCRIBE_0.IND" dx1="450.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToServiceQueryForm.CNF" dx1="60.0" dx2="60.0" dy="590.0"/>
-        <Connection Comment="" Destination="RegisterService.unregister" Source="Sequencer.E3" dx1="1150.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneRegister" dx1="60.0" dx2="60.0" dy="-810.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneUnregister" dx1="250.0" dx2="60.0" dy="-980.0"/>
-        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E5" dx1="1645.0"/>
-        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBSCRIBE_0.INITO" dx1="1305.0"/>
+        <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E1" dx1="825.0"/>
+        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E2" dx1="1015.0"/>
+        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E4" dx1="1645.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToServiceRegistryEntry.CNF" dx1="55.0" dx2="55.0" dy="2380.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="SUBSCRIBE_0.IND" dx1="445.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToServiceQueryForm.CNF" dx1="55.0" dx2="55.0" dy="585.0"/>
+        <Connection Comment="" Destination="RegisterService.unregister" Source="Sequencer.E3" dx1="1145.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneRegister" dx1="55.0" dx2="55.0" dy="-805.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneUnregister" dx1="245.0" dx2="55.0" dy="-975.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E5" dx1="1640.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBSCRIBE_0.INITO" dx1="1300.0"/>
       </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="485.0"/>
+        <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="660.0"/>
+        <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="465.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2145.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="520.0"/>
+        <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="255.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="645.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="420.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="635.0"/>
+        <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="260.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="360.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2665.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="485.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2465.0"/>
+      </DataConnections>
       <AdapterConnections>
-        <Connection Comment="" Destination="RegisterServiceHTTP.registerService" Source="RegisterService.registerService" dx1="245.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTP.queryServices" Source="QueryService.queryServices" dx1="180.0"/>
+        <Connection Comment="" Destination="RegisterServiceHTTP.registerService" Source="RegisterService.registerService" dx1="60.0" dx2="60.0" dy="130.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTP.queryServices" Source="QueryService.queryServices" dx1="175.0"/>
       </AdapterConnections>
     </SubAppNetwork>
   </Application>
   <Application Comment="" Name="HTTPTest3RegisterMoreServices">
     <SubAppNetwork>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="10110.0" y="6550.0"/>
-      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="8375.0" y="6530.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="10105.0" y="6545.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="8370.0" y="6525.0">
         <Parameter Name="INDEX" Value="1"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="10115.0" y="5575.0"/>
-      <FB Comment="" Name="F_EQ" Type="F_EQ" x="16955.0" y="6320.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="10110.0" y="5570.0"/>
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="16950.0" y="6315.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="-190.0" y="345.0">
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="-185.0" y="340.0">
         <Parameter Name="systemName" Value="%systemName%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
       </FB>
-      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="16925.0" y="4990.0">
+      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="16920.0" y="4985.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="8380.0" y="5655.0">
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="8375.0" y="5650.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="S1Reg" Type="E_SR" x="11595.0" y="1240.0"/>
-      <FB Comment="" Name="Service2RegisteredPos0" Type="TEST_CONDITION" x="18275.0" y="8820.0"/>
-      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="13715.0" y="4380.0"/>
-      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="16680.0" y="8670.0">
+      <FB Comment="" Name="S1Reg" Type="E_SR" x="11590.0" y="1235.0"/>
+      <FB Comment="" Name="Service2RegisteredPos0" Type="TEST_CONDITION" x="18270.0" y="8815.0"/>
+      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="13710.0" y="4375.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="16675.0" y="8665.0">
         <Parameter Name="IN1" Value="%validEndpoint2%"/>
       </FB>
-      <FB Comment="" Name="Service1RegisteredPos0" Type="TEST_CONDITION" x="18175.0" y="5000.0"/>
-      <FB Comment="" Name="Service1NotRegisteredPos1" Type="TEST_CONDITION" x="18180.0" y="6325.0"/>
-      <SubApp Comment="" Name="Sequencer" x="2130.0" y="4025.0">
+      <FB Comment="" Name="Service1RegisteredPos0" Type="TEST_CONDITION" x="18170.0" y="5000.0"/>
+      <FB Comment="" Name="Service1NotRegisteredPos1" Type="TEST_CONDITION" x="18175.0" y="6320.0"/>
+      <SubApp Comment="" Name="Sequencer" x="2125.0" y="4020.0">
         <SubAppInterfaceList>
           <SubAppEventInputs>
             <SubAppEvent Comment="" Name="Next" Type="Event"/>
@@ -397,298 +398,298 @@
           </SubAppEventOutputs>
         </SubAppInterfaceList>
         <SubAppNetwork>
-          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4240.0" y="150.0"/>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
           <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
-          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6090.0" y="2695.0"/>
-          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3080.0" y="1370.0"/>
-          <FB Comment="" Name="F_GT" Type="F_GT" x="2235.0" y="1365.0">
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
             <Parameter Name="IN2" Value="INT#3"/>
           </FB>
-          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="8255.0" y="2580.0"/>
-          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4835.0" y="2390.0">
+          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="8250.0" y="2575.0"/>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
             <Parameter Name="IN2" Value="INT#4"/>
           </FB>
-          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6010.0" y="4070.0"/>
-          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2240.0" y="2115.0">
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
             <Parameter Name="IN2" Value="INT#7"/>
           </FB>
-          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4870.0" y="3890.0">
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
             <Parameter Name="IN2" Value="INT#8"/>
           </FB>
-          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3090.0" y="2130.0"/>
-          <DataConnections>
-            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1665.0"/>
-            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="150.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="670.0"/>
-            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="355.0"/>
-            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="250.0"/>
-            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
-            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="490.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="230.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="375.0"/>
-          </DataConnections>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
           <EventConnections>
-            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="695.0"/>
-            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="695.0"/>
-            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="695.0"/>
-            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="695.0"/>
-            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="755.0"/>
-            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="755.0"/>
-            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="755.0"/>
-            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="755.0"/>
-            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="225.0"/>
-            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="155.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="415.0" dx2="60.0" dy="-1430.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="765.0"/>
-            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1015.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="615.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="615.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="615.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="170.0"/>
-            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="60.0" dx2="60.0" dy="370.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="230.0"/>
-            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="650.0"/>
-            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="450.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="375.0"/>
-            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1205.0"/>
-            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1205.0"/>
-            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1205.0"/>
-            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1205.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO3" dx1="115.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO0" dx1="880.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO1" dx1="880.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO2" dx1="880.0"/>
-            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="315.0" dx2="60.0" dy="590.0"/>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="220.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="410.0" dx2="55.0" dy="-1425.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="165.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="445.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1200.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1200.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1200.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1200.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO3" dx1="110.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO0" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO1" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO2" dx1="875.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
           </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+          </DataConnections>
         </SubAppNetwork>
       </SubApp>
-      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialHTTP" x="7645.0" y="2935.0">
+      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialHTTP" x="7640.0" y="2930.0">
         <Parameter Name="serviceURI" Value="%serviceURI2%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialHTTP" x="7600.0" y="1275.0">
+      <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialHTTP" x="7600.0" y="1270.0">
         <Parameter Name="serviceURI" Value="%serviceURI%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="Service2NotRegisteredPos1" Type="TEST_CONDITION" x="18270.0" y="9615.0"/>
-      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="17020.0" y="9600.0">
+      <FB Comment="" Name="Service2NotRegisteredPos1" Type="TEST_CONDITION" x="18265.0" y="9610.0"/>
+      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="17015.0" y="9600.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="S2Reg" Type="E_SR" x="11565.0" y="2850.0"/>
-      <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="13570.0" y="8180.0"/>
-      <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="8365.0" y="8495.0">
+      <FB Comment="" Name="S2Reg" Type="E_SR" x="11560.0" y="2845.0"/>
+      <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="13565.0" y="8175.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="8360.0" y="8490.0">
         <Parameter Name="INDEX" Value="1"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="10100.0" y="8515.0"/>
-      <SubApp Comment="" Name="QueryService2" Type="QueryServiceHTTPSub" x="4015.0" y="7695.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="10100.0" y="8510.0"/>
+      <SubApp Comment="" Name="QueryService2" Type="QueryServiceHTTPSub" x="4010.0" y="7690.0">
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_2" Type="GetEndpointFromServiceRegistryEntry" x="10105.0" y="7540.0"/>
-      <FB Comment="" Name="GET_AT_INDEX_2" Type="GET_AT_INDEX" x="8370.0" y="7620.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_2" Type="GetEndpointFromServiceRegistryEntry" x="10100.0" y="7535.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_2" Type="GET_AT_INDEX" x="8365.0" y="7615.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="-2065.0" y="360.0">
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="-2060.0" y="355.0">
         <Parameter Name="ID" Value="%secondResourceReady%"/>
       </FB>
-      <FB Comment="" Name="Service1NotRegisteredPos0" Type="TEST_CONDITION" x="18090.0" y="4380.0"/>
-      <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="16865.0" y="4360.0">
+      <FB Comment="" Name="Service1NotRegisteredPos0" Type="TEST_CONDITION" x="18085.0" y="4375.0"/>
+      <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="16860.0" y="4355.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="16705.0" y="7880.0">
+      <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="16700.0" y="7875.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="Service2NotRegisteredPos0" Type="TEST_CONDITION" x="17930.0" y="7900.0"/>
-      <SubApp Comment="" Name="QueryService1" Type="QueryServiceHTTPSub" x="4025.0" y="5730.0">
+      <FB Comment="" Name="Service2NotRegisteredPos0" Type="TEST_CONDITION" x="17925.0" y="7900.0"/>
+      <SubApp Comment="" Name="QueryService1" Type="QueryServiceHTTPSub" x="4020.0" y="5725.0">
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="-185.0" y="1495.0">
+      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="-180.0" y="1490.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <FB Comment="" Name="Service2" Type="FieldsToArrowheadService" x="-180.0" y="2285.0">
+      <FB Comment="" Name="Service2" Type="FieldsToArrowheadService" x="-175.0" y="2280.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="9025.0" y="12785.0">
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="9020.0" y="12780.0">
         <Parameter Name="ID" Value="%testMoreServicesReady%"/>
       </FB>
-      <DataConnections>
-        <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ_2.OUT" dx1="430.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="E_SWITCH.G" Source="S1Reg.Q" dx1="1380.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="435.0"/>
-        <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1025.0"/>
-        <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1230.0"/>
-        <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_1_1.OUT" dx1="490.0"/>
-        <Connection Comment="" Destination="E_SWITCH_1.G" Source="S2Reg.Q" dx1="255.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_2.IN_ARRAY" Source="QueryService2.serviceEntries" dx1="2330.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryService2.serviceEntries" dx1="2330.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.serviceRegistryEntry" Source="GET_AT_INDEX_2.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2710.0"/>
-        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3120.0"/>
-        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="3220.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="2680.0"/>
-        <Connection Comment="" Destination="Service1NotRegisteredPos0.check" Source="F_EQ_3.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3050.0"/>
-        <Connection Comment="" Destination="Service2NotRegisteredPos0.check" Source="F_EQ_3_1.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="3390.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService1.serviceEntries" dx1="2330.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService1.serviceEntries" dx1="2330.0"/>
-        <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService" dx1="3270.0"/>
-        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service2.arrowheadService" dx1="3290.0"/>
-        <Connection Comment="" Destination="QueryService1.service" Source="Service1.arrowheadService" dx1="950.0"/>
-        <Connection Comment="" Destination="QueryService2.service" Source="Service2.arrowheadService" dx1="770.0"/>
-      </DataConnections>
       <EventConnections>
-        <Connection Comment="" Destination="Service1NotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="Service1RegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="435.0"/>
-        <Connection Comment="" Destination="Service2RegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="435.0"/>
-        <Connection Comment="" Destination="S1Reg.S" Source="RegisterService1.doneRegister" dx1="820.0"/>
-        <Connection Comment="" Destination="S1Reg.R" Source="RegisterService1.doneUnregister" dx1="890.0"/>
-        <Connection Comment="" Destination="Service2NotRegisteredPos1.REQ" Source="F_EQ_1_1.CNF" dx1="490.0"/>
-        <Connection Comment="" Destination="S2Reg.S" Source="RegisterService2.doneRegister" dx1="2875.0"/>
-        <Connection Comment="" Destination="S2Reg.R" Source="RegisterService2.doneUnregister" dx1="2875.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="660.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="575.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
-        <Connection Comment="" Destination="F_EQ.REQ" Source="Service1RegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="460.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Service2RegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="510.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_2.REQ" Source="QueryService2.CNF" dx1="1665.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="GET_AT_INDEX_2.CNF" dx1="60.0" dx2="60.0" dy="440.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="785.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_2.CNF" dx1="60.0" dx2="60.0" dy="170.0"/>
-        <Connection Comment="" Destination="Service1NotRegisteredPos0.REQ" Source="F_EQ_3.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="1085.0"/>
-        <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO1" dx1="1380.0"/>
-        <Connection Comment="" Destination="F_EQ_3.REQ" Source="E_SWITCH.EO0" dx1="1350.0"/>
-        <Connection Comment="" Destination="F_EQ.REQ" Source="Service1NotRegisteredPos0.CNF" dx1="280.0" dx2="60.0" dy="1500.0"/>
-        <Connection Comment="" Destination="Service2NotRegisteredPos0.REQ" Source="F_EQ_3_1.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="E_SWITCH_1.EI" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="995.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="Service1RegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="440.0"/>
+        <Connection Comment="" Destination="Service2RegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="S1Reg.S" Source="RegisterService1.doneRegister" dx1="815.0"/>
+        <Connection Comment="" Destination="S1Reg.R" Source="RegisterService1.doneUnregister" dx1="885.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos1.REQ" Source="F_EQ_1_1.CNF" dx1="440.0"/>
+        <Connection Comment="" Destination="S2Reg.S" Source="RegisterService2.doneRegister" dx1="2570.0"/>
+        <Connection Comment="" Destination="S2Reg.R" Source="RegisterService2.doneUnregister" dx1="2570.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="655.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="55.0" dx2="55.0" dy="430.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="570.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="55.0" dx2="55.0" dy="480.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="Service1RegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="455.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Service2RegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="505.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_2.REQ" Source="QueryService2.CNF" dx1="1660.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="GET_AT_INDEX_2.CNF" dx1="55.0" dx2="55.0" dy="435.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="780.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_2.CNF" dx1="55.0" dx2="55.0" dy="165.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos0.REQ" Source="F_EQ_3.CNF" dx1="415.0"/>
+        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="1080.0"/>
+        <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO1" dx1="1375.0"/>
+        <Connection Comment="" Destination="F_EQ_3.REQ" Source="E_SWITCH.EO0" dx1="1345.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="Service1NotRegisteredPos0.CNF" dx1="275.0" dx2="55.0" dy="1500.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos0.REQ" Source="F_EQ_3_1.CNF" dx1="415.0"/>
+        <Connection Comment="" Destination="E_SWITCH_1.EI" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="990.0"/>
         <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH_1.EO1" dx1="1500.0"/>
-        <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="E_SWITCH_1.EO0" dx1="1340.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Service2NotRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="850.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="Service2NotRegisteredPos1.CNF" dx1="60.0" dx2="60.0" dy="1780.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="Service1NotRegisteredPos1.CNF" dx1="60.0" dx2="60.0" dy="5560.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="S2Reg.EO" dx1="10280.0" dx2="1080.0" dy="12460.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="S1Reg.EO" dx1="13060.0" dx2="520.0" dy="13520.0"/>
-        <Connection Comment="" Destination="RegisterService1.register" Source="Sequencer.E0" dx1="2030.0"/>
-        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer.E1" dx1="2780.0"/>
-        <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E3" dx1="770.0"/>
-        <Connection Comment="" Destination="RegisterService1.unregister" Source="Sequencer.E4" dx1="2560.0"/>
-        <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E6" dx1="770.0"/>
-        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer.E7" dx1="2565.0"/>
-        <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E9" dx1="750.0"/>
-        <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E2" dx1="970.0"/>
-        <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E5" dx1="775.0"/>
-        <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E8" dx1="755.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService1.CNF" dx1="1665.0"/>
-        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="575.0"/>
-        <Connection Comment="" Destination="Service2.REQ" Source="Service1.CNF" dx1="60.0" dx2="60.0" dy="395.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="Service2.CNF" dx1="530.0"/>
-        <Connection Comment="" Destination="PUBL_0.INIT" Source="Sequencer.E10" dx1="3310.0"/>
-        <Connection Comment="" Destination="PUBL_0.REQ" Source="PUBL_0.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="E_SWITCH_1.EO0" dx1="1335.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Service2NotRegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="845.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="Service2NotRegisteredPos1.CNF" dx1="55.0" dx2="55.0" dy="1775.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="Service1NotRegisteredPos1.CNF" dx1="55.0" dx2="55.0" dy="5555.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="S2Reg.EO" dx1="10275.0" dx2="1075.0" dy="12455.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="S1Reg.EO" dx1="13055.0" dx2="515.0" dy="13515.0"/>
+        <Connection Comment="" Destination="RegisterService1.register" Source="Sequencer.E0" dx1="2025.0"/>
+        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer.E1" dx1="2775.0"/>
+        <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E3" dx1="765.0"/>
+        <Connection Comment="" Destination="RegisterService1.unregister" Source="Sequencer.E4" dx1="2555.0"/>
+        <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E6" dx1="765.0"/>
+        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer.E7" dx1="2560.0"/>
+        <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E9" dx1="745.0"/>
+        <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E2" dx1="965.0"/>
+        <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E5" dx1="770.0"/>
+        <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E8" dx1="750.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService1.CNF" dx1="1660.0"/>
+        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="55.0" dx2="55.0" dy="570.0"/>
+        <Connection Comment="" Destination="Service2.REQ" Source="Service1.CNF" dx1="55.0" dx2="55.0" dy="390.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="Service2.CNF" dx1="525.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E10" dx1="3305.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="5290.0"/>
       </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ_2.OUT" dx1="445.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="E_SWITCH.G" Source="S1Reg.Q" dx1="1375.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1020.0"/>
+        <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1225.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_1_1.OUT" dx1="440.0"/>
+        <Connection Comment="" Destination="E_SWITCH_1.G" Source="S2Reg.Q" dx1="250.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_2.IN_ARRAY" Source="QueryService2.serviceEntries" dx1="2325.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryService2.serviceEntries" dx1="2325.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.serviceRegistryEntry" Source="GET_AT_INDEX_2.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2705.0"/>
+        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3115.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="3215.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="2675.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos0.check" Source="F_EQ_3.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3045.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos0.check" Source="F_EQ_3_1.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="3385.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService1.serviceEntries" dx1="2325.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService1.serviceEntries" dx1="2325.0"/>
+        <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService" dx1="3265.0"/>
+        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service2.arrowheadService" dx1="3285.0"/>
+        <Connection Comment="" Destination="QueryService1.service" Source="Service1.arrowheadService" dx1="945.0"/>
+        <Connection Comment="" Destination="QueryService2.service" Source="Service2.arrowheadService" dx1="765.0"/>
+      </DataConnections>
     </SubAppNetwork>
   </Application>
   <Application Comment="" Name="HTTPTest0CleanALL">
     <SubAppNetwork>
-      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="6220.0" y="3605.0">
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="6215.0" y="3600.0">
         <Parameter Name="ID" Value="%cleanFinished%"/>
       </FB>
-      <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialHTTP" x="3530.0" y="570.0">
+      <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialHTTP" x="3525.0" y="565.0">
         <Parameter Name="serviceURI" Value="%serviceURI%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialHTTP" x="3420.0" y="2230.0">
+      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialHTTP" x="3415.0" y="2225.0">
         <Parameter Name="serviceURI" Value="%serviceURI2%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="485.0" y="135.0">
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="480.0" y="130.0">
         <Parameter Name="systemName" Value="%systemName%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
       </FB>
-      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="465.0" y="1085.0">
+      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="460.0" y="1080.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <FB Comment="" Name="FieldsToArrowheadService_1" Type="FieldsToArrowheadService" x="470.0" y="1875.0">
+      <FB Comment="" Name="FieldsToArrowheadService_1" Type="FieldsToArrowheadService" x="465.0" y="1870.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <SubApp Comment="" Name="RegisterService2_1" Type="RegisterServicePartialHTTP" x="3405.0" y="3685.0">
+      <SubApp Comment="" Name="RegisterService2_1" Type="RegisterServicePartialHTTP" x="3400.0" y="3680.0">
         <Parameter Name="serviceURI" Value="%serviceURI2%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="FieldsToArrowheadSystem_1" Type="FieldsToArrowheadSystem" x="510.0" y="2690.0">
+      <FB Comment="" Name="FieldsToArrowheadSystem_1" Type="FieldsToArrowheadSystem" x="505.0" y="2685.0">
         <Parameter Name="systemName" Value="%systemName2%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
       </FB>
-      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="8120.0" y="3635.0">
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="8115.0" y="3630.0">
         <Parameter Name="ID" Value="%allEnded%"/>
       </FB>
-      <FB Comment="" Name="STEST_END" Type="STEST_END" x="9920.0" y="3770.0"/>
-      <FB Comment="" Name="SUBL_0_1" Type="SUBL_0" x="-840.0" y="-25.0">
+      <FB Comment="" Name="STEST_END" Type="STEST_END" x="9915.0" y="3765.0"/>
+      <FB Comment="" Name="SUBL_0_1" Type="SUBL_0" x="-835.0" y="-20.0">
         <Parameter Name="ID" Value="%allLoaded%"/>
       </FB>
+      <EventConnections>
+        <Connection Comment="" Destination="RegisterService2.unregister" Source="RegisterService1.doneUnregister" dx1="55.0" dx2="55.0" dy="875.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="55.0" dx2="55.0" dy="340.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1.REQ" Source="FieldsToArrowheadService.CNF" dx1="55.0" dx2="55.0" dy="390.0"/>
+        <Connection Comment="" Destination="RegisterService2_1.unregister" Source="RegisterService2.doneUnregister" dx1="55.0" dx2="55.0" dy="630.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="RegisterService2_1.doneUnregister" dx1="910.0"/>
+        <Connection Comment="" Destination="RegisterService1.unregister" Source="FieldsToArrowheadSystem_1.CNF" dx1="900.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem_1.REQ" Source="FieldsToArrowheadService_1.CNF" dx1="55.0" dx2="55.0" dy="400.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="SUBL_0.INITO" dx1="55.0" dx2="55.0" dy="-405.0"/>
+        <Connection Comment="" Destination="SUBL_0.INIT" Source="PUBL_0.INITO" dx1="590.0"/>
+        <Connection Comment="" Destination="STEST_END.REQ" Source="SUBL_0.IND" dx1="680.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0_1.IND" dx1="85.0"/>
+      </EventConnections>
       <DataConnections>
-        <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="615.0"/>
-        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="640.0"/>
-        <Connection Comment="" Destination="RegisterService2.providedService" Source="FieldsToArrowheadService_1.arrowheadService" dx1="850.0"/>
-        <Connection Comment="" Destination="RegisterService1.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="910.0"/>
-        <Connection Comment="" Destination="RegisterService2_1.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="845.0"/>
+        <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="610.0"/>
+        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="635.0"/>
+        <Connection Comment="" Destination="RegisterService2.providedService" Source="FieldsToArrowheadService_1.arrowheadService" dx1="845.0"/>
+        <Connection Comment="" Destination="RegisterService1.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="905.0"/>
+        <Connection Comment="" Destination="RegisterService2_1.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="840.0"/>
         <Connection Comment="" Destination="RegisterService2_1.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem" dx1="800.0"/>
       </DataConnections>
-      <EventConnections>
-        <Connection Comment="" Destination="RegisterService2.unregister" Source="RegisterService1.doneUnregister" dx1="60.0" dx2="60.0" dy="880.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="345.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService_1.REQ" Source="FieldsToArrowheadService.CNF" dx1="60.0" dx2="60.0" dy="395.0"/>
-        <Connection Comment="" Destination="RegisterService2_1.unregister" Source="RegisterService2.doneUnregister" dx1="60.0" dx2="60.0" dy="635.0"/>
-        <Connection Comment="" Destination="PUBL_0.INIT" Source="RegisterService2_1.doneUnregister" dx1="915.0"/>
-        <Connection Comment="" Destination="RegisterService1.unregister" Source="FieldsToArrowheadSystem_1.CNF" dx1="905.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadSystem_1.REQ" Source="FieldsToArrowheadService_1.CNF" dx1="60.0" dx2="60.0" dy="405.0"/>
-        <Connection Comment="" Destination="PUBL_0.REQ" Source="SUBL_0.INITO" dx1="60.0" dx2="60.0" dy="-410.0"/>
-        <Connection Comment="" Destination="SUBL_0.INIT" Source="PUBL_0.INITO" dx1="595.0"/>
-        <Connection Comment="" Destination="STEST_END.REQ" Source="SUBL_0.IND" dx1="685.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0_1.IND" dx1="90.0"/>
-      </EventConnections>
     </SubAppNetwork>
   </Application>
   <Application Comment="" Name="HTTPTest4SameServiceTwice">
     <SubAppNetwork>
-      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="595.0" y="245.0">
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="590.0" y="240.0">
         <Parameter Name="ID" Value="%testMoreServicesReady%"/>
       </FB>
-      <SubApp Comment="" Name="Sequencer" x="4570.0" y="3700.0">
+      <SubApp Comment="" Name="Sequencer" x="4565.0" y="3700.0">
         <SubAppInterfaceList>
           <SubAppEventInputs>
             <SubAppEvent Comment="" Name="Next" Type="Event"/>
@@ -709,254 +710,255 @@
           </SubAppEventOutputs>
         </SubAppInterfaceList>
         <SubAppNetwork>
-          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4240.0" y="150.0"/>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
           <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
-          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6090.0" y="2695.0"/>
-          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3080.0" y="1370.0"/>
-          <FB Comment="" Name="F_GT" Type="F_GT" x="2235.0" y="1365.0">
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
             <Parameter Name="IN2" Value="INT#3"/>
           </FB>
-          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="8255.0" y="2580.0"/>
-          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4835.0" y="2390.0">
+          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="8250.0" y="2575.0"/>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
             <Parameter Name="IN2" Value="INT#4"/>
           </FB>
-          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6010.0" y="4070.0"/>
-          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2240.0" y="2115.0">
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
             <Parameter Name="IN2" Value="INT#7"/>
           </FB>
-          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4870.0" y="3890.0">
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
             <Parameter Name="IN2" Value="INT#8"/>
           </FB>
-          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3090.0" y="2130.0"/>
-          <DataConnections>
-            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1665.0"/>
-            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="150.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="670.0"/>
-            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="355.0"/>
-            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="250.0"/>
-            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
-            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="490.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="230.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="375.0"/>
-          </DataConnections>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
           <EventConnections>
-            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="695.0"/>
-            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="695.0"/>
-            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="695.0"/>
-            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="695.0"/>
-            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="755.0"/>
-            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="755.0"/>
-            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="755.0"/>
-            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="755.0"/>
-            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="225.0"/>
-            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="155.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="415.0" dx2="60.0" dy="-1430.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="765.0"/>
-            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1015.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="615.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="615.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="615.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="170.0"/>
-            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="60.0" dx2="60.0" dy="370.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="230.0"/>
-            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="650.0"/>
-            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="450.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="375.0"/>
-            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1205.0"/>
-            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1205.0"/>
-            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1205.0"/>
-            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1205.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO3" dx1="115.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO0" dx1="880.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO1" dx1="880.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO2" dx1="880.0"/>
-            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="315.0" dx2="60.0" dy="590.0"/>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="220.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="410.0" dx2="55.0" dy="-1425.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="165.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="445.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1200.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1200.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1200.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1200.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO3" dx1="110.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO0" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO1" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO2" dx1="875.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
           </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+          </DataConnections>
         </SubAppNetwork>
       </SubApp>
-      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialHTTP" x="12415.0" y="3870.0">
+      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialHTTP" x="12410.0" y="3865.0">
         <Parameter Name="serviceURI" Value="%serviceURI2%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="4585.0" y="2430.0">
+      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="4580.0" y="2425.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialHTTP" x="12370.0" y="2210.0">
+      <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialHTTP" x="12365.0" y="2205.0">
         <Parameter Name="serviceURI" Value="%serviceURI%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="4580.0" y="1280.0">
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="4575.0" y="1275.0">
         <Parameter Name="systemName" Value="%systemName%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
       </FB>
-      <SubApp Comment="" Name="QueryServiceHTTPSub" Type="QueryServiceHTTPSub" x="7060.0" y="5570.0">
+      <SubApp Comment="" Name="QueryServiceHTTPSub" Type="QueryServiceHTTPSub" x="7055.0" y="5565.0">
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="9335.0" y="6670.0">
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="9330.0" y="6665.0">
         <Parameter Name="INDEX" Value="1"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="11075.0" y="5715.0"/>
-      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="9340.0" y="5795.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="11070.0" y="5710.0"/>
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="9335.0" y="5790.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="11070.0" y="6690.0"/>
-      <FB Comment="" Name="Service1RegisteredPos0" Type="TEST_CONDITION" x="23350.0" y="4940.0"/>
-      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="21285.0" y="3325.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="11065.0" y="6685.0"/>
+      <FB Comment="" Name="Service1RegisteredPos0" Type="TEST_CONDITION" x="23345.0" y="4935.0"/>
+      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="21280.0" y="3320.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="BothServicesRegistered" Type="TEST_CONDITION" x="24415.0" y="2125.0"/>
-      <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="21310.0" y="2680.0">
+      <FB Comment="" Name="BothServicesRegistered" Type="TEST_CONDITION" x="24410.0" y="2120.0"/>
+      <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="21305.0" y="2675.0">
         <Parameter Name="IN1" Value="%validEndpoint2%"/>
       </FB>
-      <FB Comment="" Name="F_EQ" Type="F_EQ" x="22125.0" y="4935.0">
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="22120.0" y="4930.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="F_EQ_2_1" Type="F_EQ" x="21265.0" y="1910.0">
+      <FB Comment="" Name="F_EQ_2_1" Type="F_EQ" x="21260.0" y="1905.0">
         <Parameter Name="IN1" Value="%validEndpoint2%"/>
       </FB>
-      <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="21285.0" y="1260.0">
+      <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="21280.0" y="1255.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="Service2RegisteredPos0" Type="TEST_CONDITION" x="23320.0" y="6530.0"/>
-      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="22035.0" y="6455.0">
+      <FB Comment="" Name="Service2RegisteredPos0" Type="TEST_CONDITION" x="23315.0" y="6525.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="22030.0" y="6450.0">
         <Parameter Name="IN1" Value="%validEndpoint2%"/>
       </FB>
-      <FB Comment="" Name="BothServicesNotRegistered" Type="TEST_CONDITION" x="24270.0" y="8245.0"/>
-      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="22045.0" y="8165.0">
+      <FB Comment="" Name="BothServicesNotRegistered" Type="TEST_CONDITION" x="24265.0" y="8240.0"/>
+      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="22040.0" y="8160.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="F_EQ_1_1_1" Type="F_EQ" x="22045.0" y="8855.0">
+      <FB Comment="" Name="F_EQ_1_1_1" Type="F_EQ" x="22040.0" y="8850.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="Service2NotRegisteredPos1" Type="TEST_CONDITION" x="23350.0" y="5600.0"/>
-      <FB Comment="" Name="F_EQ_4" Type="F_EQ" x="22125.0" y="5595.0">
+      <FB Comment="" Name="Service2NotRegisteredPos1" Type="TEST_CONDITION" x="23345.0" y="5600.0"/>
+      <FB Comment="" Name="F_EQ_4" Type="F_EQ" x="22120.0" y="5590.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="F_EQ_4_1" Type="F_EQ" x="22060.0" y="7190.0">
+      <FB Comment="" Name="F_EQ_4_1" Type="F_EQ" x="22055.0" y="7185.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="Service1NotRegisteredPos1" Type="TEST_CONDITION" x="23285.0" y="7195.0"/>
-      <FB Comment="" Name="F_AND" Type="F_AND" x="23145.0" y="8325.0"/>
-      <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="25840.0" y="6100.0"/>
-      <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="15075.0" y="2830.0"/>
-      <FB Comment="" Name="F_AND_1" Type="F_AND" x="22210.0" y="1550.0"/>
-      <FB Comment="" Name="F_OR" Type="F_OR" x="23915.0" y="2225.0"/>
-      <FB Comment="" Name="F_AND_1_1" Type="F_AND" x="22210.0" y="2905.0"/>
-      <FB Comment="" Name="BOOL2BOOL" Type="BOOL2BOOL" x="23065.0" y="1745.0"/>
-      <FB Comment="" Name="BOOL2BOOL_1" Type="BOOL2BOOL" x="23000.0" y="2670.0"/>
-      <FB Comment="" Name="FieldsToArrowheadSystem_1" Type="FieldsToArrowheadSystem" x="4580.0" y="235.0">
+      <FB Comment="" Name="Service1NotRegisteredPos1" Type="TEST_CONDITION" x="23280.0" y="7190.0"/>
+      <FB Comment="" Name="F_AND" Type="F_AND" x="23140.0" y="8320.0"/>
+      <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="25835.0" y="6100.0"/>
+      <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="15070.0" y="2825.0"/>
+      <FB Comment="" Name="F_AND_1" Type="F_AND" x="22205.0" y="1545.0"/>
+      <FB Comment="" Name="F_OR" Type="F_OR" x="23910.0" y="2220.0"/>
+      <FB Comment="" Name="F_AND_1_1" Type="F_AND" x="22205.0" y="2900.0"/>
+      <FB Comment="" Name="BOOL2BOOL" Type="BOOL2BOOL" x="23060.0" y="1740.0"/>
+      <FB Comment="" Name="BOOL2BOOL_1" Type="BOOL2BOOL" x="23000.0" y="2665.0"/>
+      <FB Comment="" Name="FieldsToArrowheadSystem_1" Type="FieldsToArrowheadSystem" x="4575.0" y="230.0">
         <Parameter Name="systemName" Value="%systemName2%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
       </FB>
-      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="5855.0" y="7815.0">
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="5850.0" y="7810.0">
         <Parameter Name="ID" Value="%sameServiceTwiceReady%"/>
       </FB>
-      <DataConnections>
-        <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService" dx1="3270.0"/>
-        <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="4475.0"/>
-        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="3295.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="Service1.arrowheadService" dx1="615.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="630.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="630.0"/>
-        <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ.OUT"/>
-        <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="450.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3910.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="3870.0"/>
-        <Connection Comment="" Destination="F_AND.IN1" Source="F_EQ_1_1.OUT" dx1="355.0"/>
-        <Connection Comment="" Destination="F_AND.IN2" Source="F_EQ_1_1_1.OUT" dx1="355.0"/>
-        <Connection Comment="" Destination="BothServicesNotRegistered.check" Source="F_AND.OUT" dx1="370.0"/>
-        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4850.0"/>
-        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4805.0"/>
-        <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4810.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4780.0"/>
-        <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_4.OUT"/>
-        <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ_4_1.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="F_AND_1_1.IN1" Source="F_EQ_3.OUT" dx1="255.0"/>
-        <Connection Comment="" Destination="F_AND_1_1.IN2" Source="F_EQ_2.OUT" dx1="270.0"/>
-        <Connection Comment="" Destination="F_AND_1.IN1" Source="F_EQ_3_1.OUT" dx1="270.0"/>
-        <Connection Comment="" Destination="F_AND_1.IN2" Source="F_EQ_2_1.OUT" dx1="280.0"/>
-        <Connection Comment="" Destination="BOOL2BOOL.IN" Source="F_AND_1.OUT" dx1="230.0"/>
-        <Connection Comment="" Destination="BOOL2BOOL_1.IN" Source="F_AND_1_1.OUT" dx1="200.0"/>
-        <Connection Comment="" Destination="F_OR.IN2" Source="BOOL2BOOL_1.OUT" dx1="85.0"/>
-        <Connection Comment="" Destination="F_OR.IN1" Source="BOOL2BOOL.OUT" dx1="160.0"/>
-        <Connection Comment="" Destination="BothServicesRegistered.check" Source="F_OR.OUT" dx1="60.0" dx2="60.0" dy="-50.0"/>
-        <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4430.0"/>
-        <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4440.0"/>
-        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4390.0"/>
-        <Connection Comment="" Destination="F_EQ_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4380.0"/>
-        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem" dx1="4015.0"/>
-      </DataConnections>
       <EventConnections>
-        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="820.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="425.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryServiceHTTPSub.CNF" dx1="630.0"/>
-        <Connection Comment="" Destination="Service1RegisteredPos0.REQ" Source="F_EQ.CNF"/>
-        <Connection Comment="" Destination="Service2RegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="450.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1_1.REQ" Source="F_EQ_1_1.CNF" dx1="60.0" dx2="60.0" dy="345.0"/>
-        <Connection Comment="" Destination="F_AND.REQ" Source="F_EQ_1_1_1.CNF" dx1="240.0"/>
-        <Connection Comment="" Destination="BothServicesNotRegistered.REQ" Source="F_AND.CNF" dx1="370.0"/>
-        <Connection Comment="" Destination="E_MERGE.EI2" Source="BothServicesNotRegistered.CNF" dx1="435.0"/>
-        <Connection Comment="" Destination="E_MERGE.EI2" Source="Service1NotRegisteredPos1.CNF" dx1="930.0"/>
-        <Connection Comment="" Destination="E_MERGE.EI2" Source="Service2NotRegisteredPos1.CNF" dx1="895.0"/>
-        <Connection Comment="" Destination="E_MERGE.EI1" Source="BothServicesRegistered.CNF" dx1="370.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="60.0" dx2="60.0" dy="6640.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="3600.0" dx2="2000.0" dy="-3580.0"/>
-        <Connection Comment="" Destination="E_MERGE_1.EI1" Source="RegisterService1.doneRegister" dx1="985.0"/>
-        <Connection Comment="" Destination="E_MERGE_1.EI2" Source="RegisterService1.doneUnregister" dx1="725.0"/>
-        <Connection Comment="" Destination="E_MERGE_1.EI1" Source="RegisterService2.doneRegister" dx1="835.0"/>
-        <Connection Comment="" Destination="E_MERGE_1.EI2" Source="RegisterService2.doneUnregister" dx1="835.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="60.0" dx2="60.0" dy="2300.0"/>
-        <Connection Comment="" Destination="F_EQ_2_1.REQ" Source="F_EQ_3_1.CNF" dx1="60.0" dx2="60.0" dy="320.0"/>
-        <Connection Comment="" Destination="F_EQ_4.REQ" Source="Service1RegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="330.0"/>
-        <Connection Comment="" Destination="Service2NotRegisteredPos1.REQ" Source="F_EQ_4.CNF"/>
-        <Connection Comment="" Destination="F_EQ_4_1.REQ" Source="Service2RegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="330.0"/>
-        <Connection Comment="" Destination="Service1NotRegisteredPos1.REQ" Source="F_EQ_4_1.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="F_AND_1.REQ" Source="F_EQ_2_1.CNF" dx1="280.0"/>
-        <Connection Comment="" Destination="BOOL2BOOL.REQ" Source="F_AND_1.CNF" dx1="230.0"/>
-        <Connection Comment="" Destination="F_EQ_3.REQ" Source="BOOL2BOOL.CNF" dx1="60.0" dx2="60.0" dy="465.0"/>
-        <Connection Comment="" Destination="F_EQ_2.REQ" Source="F_EQ_3.CNF" dx1="60.0" dx2="60.0" dy="320.0"/>
-        <Connection Comment="" Destination="F_AND_1_1.REQ" Source="F_EQ_2.CNF" dx1="270.0"/>
+        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="55.0" dx2="55.0" dy="815.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="420.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="55.0" dx2="55.0" dy="480.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="55.0" dx2="55.0" dy="430.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryServiceHTTPSub.CNF" dx1="625.0"/>
+        <Connection Comment="" Destination="Service1RegisteredPos0.REQ" Source="F_EQ.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="Service2RegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="445.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1_1.REQ" Source="F_EQ_1_1.CNF" dx1="55.0" dx2="55.0" dy="340.0"/>
+        <Connection Comment="" Destination="F_AND.REQ" Source="F_EQ_1_1_1.CNF" dx1="235.0"/>
+        <Connection Comment="" Destination="BothServicesNotRegistered.REQ" Source="F_AND.CNF" dx1="365.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI2" Source="BothServicesNotRegistered.CNF" dx1="385.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI2" Source="Service1NotRegisteredPos1.CNF" dx1="925.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI2" Source="Service2NotRegisteredPos1.CNF" dx1="890.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI1" Source="BothServicesRegistered.CNF" dx1="365.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="55.0" dx2="55.0" dy="6635.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="3600.0" dx2="2000.0" dy="-3575.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI1" Source="RegisterService1.doneRegister" dx1="980.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI2" Source="RegisterService1.doneUnregister" dx1="720.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI1" Source="RegisterService2.doneRegister" dx1="830.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI2" Source="RegisterService2.doneUnregister" dx1="830.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="55.0" dx2="55.0" dy="2300.0"/>
+        <Connection Comment="" Destination="F_EQ_2_1.REQ" Source="F_EQ_3_1.CNF" dx1="55.0" dx2="55.0" dy="315.0"/>
+        <Connection Comment="" Destination="F_EQ_4.REQ" Source="Service1RegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="325.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos1.REQ" Source="F_EQ_4.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1.REQ" Source="Service2RegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="325.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos1.REQ" Source="F_EQ_4_1.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="F_AND_1.REQ" Source="F_EQ_2_1.CNF" dx1="275.0"/>
+        <Connection Comment="" Destination="BOOL2BOOL.REQ" Source="F_AND_1.CNF" dx1="225.0"/>
+        <Connection Comment="" Destination="F_EQ_3.REQ" Source="BOOL2BOOL.CNF" dx1="55.0" dx2="55.0" dy="460.0"/>
+        <Connection Comment="" Destination="F_EQ_2.REQ" Source="F_EQ_3.CNF" dx1="55.0" dx2="55.0" dy="315.0"/>
+        <Connection Comment="" Destination="F_AND_1_1.REQ" Source="F_EQ_2.CNF" dx1="265.0"/>
         <Connection Comment="" Destination="BOOL2BOOL_1.REQ" Source="F_AND_1_1.CNF" dx1="200.0"/>
-        <Connection Comment="" Destination="F_OR.REQ" Source="BOOL2BOOL_1.CNF" dx1="85.0"/>
-        <Connection Comment="" Destination="BothServicesRegistered.REQ" Source="F_OR.CNF" dx1="60.0" dx2="60.0" dy="-50.0"/>
+        <Connection Comment="" Destination="F_OR.REQ" Source="BOOL2BOOL_1.CNF" dx1="80.0"/>
+        <Connection Comment="" Destination="BothServicesRegistered.REQ" Source="F_OR.CNF" dx1="65.0"/>
         <Connection Comment="" Destination="RegisterService1.register" Source="Sequencer.E0" dx1="3400.0"/>
-        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer.E1" dx1="3730.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E2" dx1="1150.0"/>
-        <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="Sequencer.E3" dx1="8165.0"/>
-        <Connection Comment="" Destination="RegisterService1.unregister" Source="Sequencer.E4" dx1="3705.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E5" dx1="1050.0"/>
-        <Connection Comment="" Destination="F_EQ_1.REQ" Source="Sequencer.E6" dx1="8865.0"/>
-        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer.E7" dx1="3730.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E8" dx1="1050.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Sequencer.E9" dx1="8545.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="Service1.CNF" dx1="60.0" dx2="60.0" dy="635.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToArrowheadSystem_1.CNF" dx1="60.0" dx2="60.0" dy="520.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadSystem_1.REQ" Source="SUBL_0.IND" dx1="220.0"/>
-        <Connection Comment="" Destination="PUBL_0.INIT" Source="Sequencer.E10" dx1="840.0"/>
+        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer.E1" dx1="3725.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E2" dx1="1145.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="Sequencer.E3" dx1="8160.0"/>
+        <Connection Comment="" Destination="RegisterService1.unregister" Source="Sequencer.E4" dx1="3700.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E5" dx1="1045.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="Sequencer.E6" dx1="8860.0"/>
+        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer.E7" dx1="3725.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E8" dx1="1045.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Sequencer.E9" dx1="8540.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="Service1.CNF" dx1="55.0" dx2="55.0" dy="630.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToArrowheadSystem_1.CNF" dx1="55.0" dx2="55.0" dy="515.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem_1.REQ" Source="SUBL_0.IND" dx1="215.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="2380.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E10" dx1="815.0"/>
       </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService" dx1="3265.0"/>
+        <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="4470.0"/>
+        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="3290.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="Service1.arrowheadService" dx1="610.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="625.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="625.0"/>
+        <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="445.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3905.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="3865.0"/>
+        <Connection Comment="" Destination="F_AND.IN1" Source="F_EQ_1_1.OUT" dx1="350.0"/>
+        <Connection Comment="" Destination="F_AND.IN2" Source="F_EQ_1_1_1.OUT" dx1="350.0"/>
+        <Connection Comment="" Destination="BothServicesNotRegistered.check" Source="F_AND.OUT" dx1="365.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4845.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4800.0"/>
+        <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4805.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4775.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_4.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ_4_1.OUT"/>
+        <Connection Comment="" Destination="F_AND_1_1.IN1" Source="F_EQ_3.OUT" dx1="250.0"/>
+        <Connection Comment="" Destination="F_AND_1_1.IN2" Source="F_EQ_2.OUT" dx1="265.0"/>
+        <Connection Comment="" Destination="F_AND_1.IN1" Source="F_EQ_3_1.OUT" dx1="265.0"/>
+        <Connection Comment="" Destination="F_AND_1.IN2" Source="F_EQ_2_1.OUT" dx1="275.0"/>
+        <Connection Comment="" Destination="BOOL2BOOL.IN" Source="F_AND_1.OUT" dx1="225.0"/>
+        <Connection Comment="" Destination="BOOL2BOOL_1.IN" Source="F_AND_1_1.OUT" dx1="200.0"/>
+        <Connection Comment="" Destination="F_OR.IN2" Source="BOOL2BOOL_1.OUT" dx1="80.0"/>
+        <Connection Comment="" Destination="F_OR.IN1" Source="BOOL2BOOL.OUT" dx1="155.0"/>
+        <Connection Comment="" Destination="BothServicesRegistered.check" Source="F_OR.OUT" dx1="65.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4425.0"/>
+        <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4435.0"/>
+        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4385.0"/>
+        <Connection Comment="" Destination="F_EQ_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4375.0"/>
+        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem" dx1="4010.0"/>
+      </DataConnections>
     </SubAppNetwork>
   </Application>
   <Application Comment="" Name="HTTPTest5VersionAndMetadata">
     <SubAppNetwork>
-      <SubApp Comment="" Name="RegisterServiceFullHTTP" Type="RegisterServiceFullHTTP" x="5145.0" y="260.0">
+      <SubApp Comment="" Name="RegisterServiceFullHTTP" Type="RegisterServiceFullHTTP" x="5140.0" y="255.0">
         <Parameter Name="systemName" Value="%systemName%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
@@ -969,305 +971,305 @@
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="QueryServiceHTTPSub" Type="QueryServiceHTTPSub" x="5085.0" y="2910.0">
+      <SubApp Comment="" Name="QueryServiceHTTPSub" Type="QueryServiceHTTPSub" x="5080.0" y="2905.0">
         <Parameter Name="version" Value="0"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="2935.0" y="2660.0">
+      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="2930.0" y="2655.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="8230.0" y="2750.0"/>
-      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="7045.0" y="2710.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="8225.0" y="2745.0"/>
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="7040.0" y="2705.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="F_EQ_4" Type="F_EQ" x="11040.0" y="2605.0">
+      <FB Comment="" Name="F_EQ_4" Type="F_EQ" x="11035.0" y="2600.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="LowerVersion" Type="TEST_CONDITION" x="12265.0" y="2610.0"/>
-      <FB Comment="" Name="FieldsToArrowheadService_1" Type="FieldsToArrowheadService" x="2910.0" y="3955.0">
+      <FB Comment="" Name="LowerVersion" Type="TEST_CONDITION" x="12260.0" y="2605.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService_1" Type="FieldsToArrowheadService" x="2905.0" y="3950.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <FB Comment="" Name="SameVersion" Type="TEST_CONDITION" x="12240.0" y="3905.0"/>
-      <SubApp Comment="" Name="QueryServiceHTTPSub_1" Type="QueryServiceHTTPSub" x="5060.0" y="4205.0">
+      <FB Comment="" Name="SameVersion" Type="TEST_CONDITION" x="12235.0" y="3900.0"/>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1" Type="QueryServiceHTTPSub" x="5055.0" y="4200.0">
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="7020.0" y="4005.0">
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="7015.0" y="4000.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="8205.0" y="4045.0"/>
-      <FB Comment="" Name="F_EQ_4_1" Type="F_EQ" x="11015.0" y="3900.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="8200.0" y="4040.0"/>
+      <FB Comment="" Name="F_EQ_4_1" Type="F_EQ" x="11010.0" y="3900.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="OneInterfaceOutOfTwo" Type="TEST_CONDITION" x="12210.0" y="5395.0"/>
-      <SubApp Comment="" Name="QueryServiceHTTPSub_1_1" Type="QueryServiceHTTPSub" x="5030.0" y="5695.0">
+      <FB Comment="" Name="OneInterfaceOutOfTwo" Type="TEST_CONDITION" x="12205.0" y="5390.0"/>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_1" Type="QueryServiceHTTPSub" x="5025.0" y="5690.0">
         <Parameter Name="metadaSearch" Value="true"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8175.0" y="5535.0"/>
-      <FB Comment="" Name="F_EQ_4_1_1" Type="F_EQ" x="10985.0" y="5390.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8170.0" y="5530.0"/>
+      <FB Comment="" Name="F_EQ_4_1_1" Type="F_EQ" x="10980.0" y="5385.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="FieldsToArrowheadService_1_1" Type="FieldsToArrowheadService" x="2880.0" y="5445.0">
+      <FB Comment="" Name="FieldsToArrowheadService_1_1" Type="FieldsToArrowheadService" x="2875.0" y="5440.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="6990.0" y="5495.0">
+      <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="6985.0" y="5490.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="OneInterfaceOutOfTwo_2" Type="TEST_CONDITION" x="12175.0" y="6800.0"/>
-      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2" Type="QueryServiceHTTPSub" x="4995.0" y="7100.0">
+      <FB Comment="" Name="OneInterfaceOutOfTwo_2" Type="TEST_CONDITION" x="12170.0" y="6800.0"/>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2" Type="QueryServiceHTTPSub" x="4990.0" y="7100.0">
         <Parameter Name="metadaSearch" Value="true"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2" Type="GetEndpointFromServiceRegistryEntry" x="8140.0" y="6940.0"/>
-      <FB Comment="" Name="F_EQ_4_1_2" Type="F_EQ" x="10950.0" y="6795.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2" Type="GetEndpointFromServiceRegistryEntry" x="8135.0" y="6935.0"/>
+      <FB Comment="" Name="F_EQ_4_1_2" Type="F_EQ" x="10945.0" y="6790.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="FieldsToArrowheadService_1_2" Type="FieldsToArrowheadService" x="2845.0" y="6850.0">
+      <FB Comment="" Name="FieldsToArrowheadService_1_2" Type="FieldsToArrowheadService" x="2840.0" y="6845.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <FB Comment="" Name="GET_AT_INDEX_1_2" Type="GET_AT_INDEX" x="6955.0" y="6900.0">
+      <FB Comment="" Name="GET_AT_INDEX_1_2" Type="GET_AT_INDEX" x="6950.0" y="6900.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="WrongInterface" Type="TEST_CONDITION" x="12260.0" y="9955.0"/>
-      <FB Comment="" Name="GET_AT_INDEX_1_2_1" Type="GET_AT_INDEX" x="7040.0" y="10055.0">
+      <FB Comment="" Name="WrongInterface" Type="TEST_CONDITION" x="12255.0" y="9950.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1_2_1" Type="GET_AT_INDEX" x="7035.0" y="10050.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1" Type="QueryServiceHTTPSub" x="5080.0" y="10140.0">
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1" Type="QueryServiceHTTPSub" x="5075.0" y="10135.0">
         <Parameter Name="metadaSearch" Value="true"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1" Type="GetEndpointFromServiceRegistryEntry" x="8225.0" y="10095.0"/>
-      <FB Comment="" Name="FieldsToArrowheadService_1_2_1" Type="FieldsToArrowheadService" x="2930.0" y="10005.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1" Type="GetEndpointFromServiceRegistryEntry" x="8220.0" y="10090.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService_1_2_1" Type="FieldsToArrowheadService" x="2925.0" y="10000.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON1&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <FB Comment="" Name="F_EQ_4_1_2_1" Type="F_EQ" x="11035.0" y="9950.0">
+      <FB Comment="" Name="F_EQ_4_1_2_1" Type="F_EQ" x="11030.0" y="9945.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="710.0" y="235.0">
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="705.0" y="230.0">
         <Parameter Name="ID" Value="%sameServiceTwiceReady%"/>
       </FB>
-      <FB Comment="" Name="OnlyOneMetadata" Type="TEST_CONDITION" x="12205.0" y="11350.0"/>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8170.0" y="11490.0"/>
-      <FB Comment="" Name="F_EQ_4_1_2_1_1" Type="F_EQ" x="10980.0" y="11345.0">
+      <FB Comment="" Name="OnlyOneMetadata" Type="TEST_CONDITION" x="12200.0" y="11345.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8165.0" y="11485.0"/>
+      <FB Comment="" Name="F_EQ_4_1_2_1_1" Type="F_EQ" x="10975.0" y="11340.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1" Type="FieldsToArrowheadService" x="2875.0" y="11400.0">
+      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1" Type="FieldsToArrowheadService" x="2870.0" y="11400.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="[&quot;key1=value1&quot;]"/>
       </FB>
-      <FB Comment="" Name="GET_AT_INDEX_1_2_1_1" Type="GET_AT_INDEX" x="6985.0" y="11450.0">
+      <FB Comment="" Name="GET_AT_INDEX_1_2_1_1" Type="GET_AT_INDEX" x="6980.0" y="11445.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1" Type="QueryServiceHTTPSub" x="5025.0" y="11535.0">
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1" Type="QueryServiceHTTPSub" x="5020.0" y="11530.0">
         <Parameter Name="metadaSearch" Value="true"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1_1" Type="QueryServiceHTTPSub" x="5095.0" y="12930.0">
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1_1" Type="QueryServiceHTTPSub" x="5090.0" y="12925.0">
         <Parameter Name="metadaSearch" Value="true"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8240.0" y="12885.0"/>
-      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1_1" Type="FieldsToArrowheadService" x="2945.0" y="12795.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8235.0" y="12880.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1_1" Type="FieldsToArrowheadService" x="2940.0" y="12790.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
       </FB>
-      <FB Comment="" Name="F_EQ_4_1_2_1_1_1" Type="F_EQ" x="11050.0" y="12740.0">
+      <FB Comment="" Name="F_EQ_4_1_2_1_1_1" Type="F_EQ" x="11045.0" y="12735.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="GET_AT_INDEX_1_2_1_1_1" Type="GET_AT_INDEX" x="7055.0" y="12845.0">
+      <FB Comment="" Name="GET_AT_INDEX_1_2_1_1_1" Type="GET_AT_INDEX" x="7050.0" y="12840.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="NoMetadataAndAsked" Type="TEST_CONDITION" x="12275.0" y="12745.0"/>
-      <FB Comment="" Name="F_EQ_4_1_2_1_2" Type="F_EQ" x="10755.0" y="8355.0">
+      <FB Comment="" Name="NoMetadataAndAsked" Type="TEST_CONDITION" x="12270.0" y="12740.0"/>
+      <FB Comment="" Name="F_EQ_4_1_2_1_2" Type="F_EQ" x="10750.0" y="8350.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="GET_AT_INDEX_1_2_1_2" Type="GET_AT_INDEX" x="6760.0" y="8460.0">
+      <FB Comment="" Name="GET_AT_INDEX_1_2_1_2" Type="GET_AT_INDEX" x="6755.0" y="8455.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_2" Type="FieldsToArrowheadService" x="2650.0" y="8410.0">
+      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_2" Type="FieldsToArrowheadService" x="2645.0" y="8405.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_2" Type="GetEndpointFromServiceRegistryEntry" x="7945.0" y="8500.0"/>
-      <FB Comment="" Name="NoInterface" Type="TEST_CONDITION" x="11980.0" y="8360.0"/>
-      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_2" Type="QueryServiceHTTPSub" x="4800.0" y="8545.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_2" Type="GetEndpointFromServiceRegistryEntry" x="7940.0" y="8500.0"/>
+      <FB Comment="" Name="NoInterface" Type="TEST_CONDITION" x="11975.0" y="8355.0"/>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_2" Type="QueryServiceHTTPSub" x="4800.0" y="8540.0">
         <Parameter Name="metadaSearch" Value="true"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1_1_1" Type="QueryServiceHTTPSub" x="5020.0" y="14490.0">
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1_1_1" Type="QueryServiceHTTPSub" x="5015.0" y="14485.0">
         <Parameter Name="metadaSearch" Value="false"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8165.0" y="14445.0"/>
-      <FB Comment="" Name="GET_AT_INDEX_1_2_1_1_1_1" Type="GET_AT_INDEX" x="6980.0" y="14405.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8160.0" y="14440.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1_2_1_1_1_1" Type="GET_AT_INDEX" x="6975.0" y="14400.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="F_EQ_4_1_2_1_1_1_1" Type="F_EQ" x="10975.0" y="14300.0">
+      <FB Comment="" Name="F_EQ_4_1_2_1_1_1_1" Type="F_EQ" x="10970.0" y="14300.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="WrongMetadaButNotAsked" Type="TEST_CONDITION" x="12200.0" y="14305.0"/>
-      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1_1_1" Type="FieldsToArrowheadService" x="2870.0" y="14355.0">
+      <FB Comment="" Name="WrongMetadaButNotAsked" Type="TEST_CONDITION" x="12200.0" y="14300.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1_1_1" Type="FieldsToArrowheadService" x="2865.0" y="14350.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
       </FB>
-      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="7000.0" y="220.0">
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="8000.0" y="200.0">
         <Parameter Name="ID" Value="%versionEnded%"/>
       </FB>
-      <DataConnections>
-        <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="FieldsToArrowheadService.arrowheadService" dx1="260.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="330.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="295.0"/>
-        <Connection Comment="" Destination="LowerVersion.check" Source="F_EQ_4.OUT"/>
-        <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="730.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="730.0"/>
-        <Connection Comment="" Destination="SameVersion.check" Source="F_EQ_4_1.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub_1.serviceEntries" dx1="330.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="295.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1.service" Source="FieldsToArrowheadService_1.arrowheadService" dx1="260.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="295.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_1.serviceEntries" dx1="330.0"/>
-        <Connection Comment="" Destination="OneInterfaceOutOfTwo.check" Source="F_EQ_4_1_1.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="730.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_1.service" Source="FieldsToArrowheadService_1_1.arrowheadService" dx1="260.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2.OUT" dx1="295.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2.serviceEntries" dx1="330.0"/>
-        <Connection Comment="" Destination="OneInterfaceOutOfTwo_2.check" Source="F_EQ_4_1_2.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2.endpoint" dx1="730.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2.service" Source="FieldsToArrowheadService_1_2.arrowheadService" dx1="260.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1.endpoint" dx1="730.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1.service" Source="FieldsToArrowheadService_1_2_1.arrowheadService" dx1="260.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1.serviceEntries" dx1="330.0"/>
-        <Connection Comment="" Destination="WrongInterface.check" Source="F_EQ_4_1_2_1.OUT" dx1="385.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1.OUT" dx1="295.0"/>
-        <Connection Comment="" Destination="OnlyOneMetadata.check" Source="F_EQ_4_1_2_1_1.OUT" dx1="345.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1.OUT" dx1="295.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1.service" Source="FieldsToArrowheadService_1_2_1_1.arrowheadService" dx1="260.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1.serviceEntries" dx1="330.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1.endpoint" dx1="730.0"/>
-        <Connection Comment="" Destination="NoMetadataAndAsked.check" Source="F_EQ_4_1_2_1_1_1.OUT" dx1="310.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1.OUT" dx1="220.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.endpoint" dx1="730.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1.arrowheadService" dx1="260.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1.serviceEntries" dx1="330.0"/>
-        <Connection Comment="" Destination="NoInterface.check" Source="F_EQ_4_1_2_1_2.OUT" dx1="345.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_2.OUT" dx1="295.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.service" Source="FieldsToArrowheadService_1_2_1_2.arrowheadService" dx1="260.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.endpoint" dx1="730.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_2.serviceEntries" dx1="330.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1_1.OUT" dx1="155.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1_1.arrowheadService" dx1="260.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.endpoint" dx1="730.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1_1.serviceEntries" dx1="330.0"/>
-        <Connection Comment="" Destination="WrongMetadaButNotAsked.check" Source="F_EQ_4_1_2_1_1_1_1.OUT" dx1="310.0"/>
-      </DataConnections>
       <EventConnections>
-        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="FieldsToArrowheadService.CNF" dx1="260.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryServiceHTTPSub.CNF" dx1="330.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="295.0"/>
-        <Connection Comment="" Destination="LowerVersion.REQ" Source="F_EQ_4.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="F_EQ_4.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="730.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="FieldsToArrowheadService.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryServiceHTTPSub.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="290.0"/>
+        <Connection Comment="" Destination="LowerVersion.REQ" Source="F_EQ_4.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ_4.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="725.0"/>
         <Connection Comment="" Destination="SameVersion.REQ" Source="F_EQ_4_1.CNF"/>
-        <Connection Comment="" Destination="F_EQ_4_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="730.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="295.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1.REQ" Source="FieldsToArrowheadService_1.CNF" dx1="260.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryServiceHTTPSub_1.CNF" dx1="330.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="295.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="730.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="QueryServiceHTTPSub_1_1.CNF" dx1="330.0"/>
-        <Connection Comment="" Destination="OneInterfaceOutOfTwo.REQ" Source="F_EQ_4_1_1.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_1.REQ" Source="FieldsToArrowheadService_1_1.CNF" dx1="260.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2.REQ" Source="GET_AT_INDEX_1_2.CNF" dx1="295.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2.CNF" dx1="730.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2.REQ" Source="QueryServiceHTTPSub_1_2.CNF" dx1="330.0"/>
-        <Connection Comment="" Destination="OneInterfaceOutOfTwo_2.REQ" Source="F_EQ_4_1_2.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2.REQ" Source="FieldsToArrowheadService_1_2.CNF" dx1="260.0"/>
-        <Connection Comment="" Destination="WrongInterface.REQ" Source="F_EQ_4_1_2_1.CNF" dx1="385.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1.REQ" Source="FieldsToArrowheadService_1_2_1.CNF" dx1="260.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1.REQ" Source="QueryServiceHTTPSub_1_2_1.CNF" dx1="330.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1.REQ" Source="GET_AT_INDEX_1_2_1.CNF" dx1="295.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1.CNF" dx1="730.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1.CNF" dx1="260.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1.CNF" dx1="295.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1.CNF" dx1="330.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1.CNF" dx1="730.0"/>
-        <Connection Comment="" Destination="OnlyOneMetadata.REQ" Source="F_EQ_4_1_2_1_1.CNF" dx1="345.0"/>
-        <Connection Comment="" Destination="NoMetadataAndAsked.REQ" Source="F_EQ_4_1_2_1_1_1.CNF" dx1="310.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.CNF" dx1="730.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1.CNF" dx1="260.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1.CNF" dx1="330.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1.CNF" dx1="220.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.REQ" Source="FieldsToArrowheadService_1_2_1_2.CNF" dx1="260.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.REQ" Source="QueryServiceHTTPSub_1_2_1_2.CNF" dx1="330.0"/>
-        <Connection Comment="" Destination="NoInterface.REQ" Source="F_EQ_4_1_2_1_2.CNF" dx1="345.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.REQ" Source="GET_AT_INDEX_1_2_1_2.CNF" dx1="295.0"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2_1_2.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.CNF" dx1="730.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1_1.CNF" dx1="155.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1_1.CNF" dx1="330.0"/>
-        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1_1.CNF" dx1="260.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="290.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1.REQ" Source="FieldsToArrowheadService_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryServiceHTTPSub_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="290.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="QueryServiceHTTPSub_1_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="OneInterfaceOutOfTwo.REQ" Source="F_EQ_4_1_1.CNF"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_1.REQ" Source="FieldsToArrowheadService_1_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2.REQ" Source="GET_AT_INDEX_1_2.CNF" dx1="290.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2.REQ" Source="QueryServiceHTTPSub_1_2.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="OneInterfaceOutOfTwo_2.REQ" Source="F_EQ_4_1_2.CNF" dx1="390.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2.REQ" Source="FieldsToArrowheadService_1_2.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="WrongInterface.REQ" Source="F_EQ_4_1_2_1.CNF" dx1="345.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1.REQ" Source="FieldsToArrowheadService_1_2_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1.REQ" Source="QueryServiceHTTPSub_1_2_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1.REQ" Source="GET_AT_INDEX_1_2_1.CNF" dx1="290.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1.CNF" dx1="225.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="OnlyOneMetadata.REQ" Source="F_EQ_4_1_2_1_1.CNF" dx1="300.0"/>
+        <Connection Comment="" Destination="NoMetadataAndAsked.REQ" Source="F_EQ_4_1_2_1_1_1.CNF"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1.CNF" dx1="140.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.REQ" Source="FieldsToArrowheadService_1_2_1_2.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.REQ" Source="QueryServiceHTTPSub_1_2_1_2.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="NoInterface.REQ" Source="F_EQ_4_1_2_1_2.CNF" dx1="300.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.REQ" Source="GET_AT_INDEX_1_2_1_2.CNF" dx1="225.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_2.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1_1.CNF" dx1="60.0" dx2="60.0" dy="20.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1_1.CNF" dx1="255.0"/>
         <Connection Comment="" Destination="WrongMetadaButNotAsked.REQ" Source="F_EQ_4_1_2_1_1_1_1.CNF"/>
-        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.CNF" dx1="730.0"/>
-        <Connection Comment="" Destination="RegisterServiceFullHTTP.register" Source="SUBL_0.IND" dx1="2005.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="RegisterServiceFullHTTP.doneRegister" dx1="60.0" dx2="60.0" dy="1200.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService_1.REQ" Source="LowerVersion.CNF" dx1="60.0" dx2="60.0" dy="675.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService_1_1.REQ" Source="SameVersion.CNF" dx1="60.0" dx2="60.0" dy="770.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService_1_2.REQ" Source="OneInterfaceOutOfTwo.CNF" dx1="60.0" dx2="60.0" dy="725.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_2.REQ" Source="OneInterfaceOutOfTwo_2.CNF" dx1="60.0" dx2="60.0" dy="805.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1.REQ" Source="NoInterface.CNF" dx1="60.0" dx2="60.0" dy="825.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1.REQ" Source="WrongInterface.CNF" dx1="60.0" dx2="60.0" dy="720.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1.REQ" Source="OnlyOneMetadata.CNF" dx1="60.0" dx2="60.0" dy="725.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1_1.REQ" Source="NoMetadataAndAsked.CNF" dx1="60.0" dx2="60.0" dy="805.0"/>
-        <Connection Comment="" Destination="RegisterServiceFullHTTP.unregister" Source="WrongMetadaButNotAsked.CNF" dx1="60.0" dx2="60.0" dy="-6970.0"/>
-        <Connection Comment="" Destination="PUBL_0.INIT" Source="RegisterServiceFullHTTP.doneUnregister" dx1="450.0"/>
-        <Connection Comment="" Destination="PUBL_0.REQ" Source="PUBL_0.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.CNF" dx1="640.0"/>
+        <Connection Comment="" Destination="RegisterServiceFullHTTP.register" Source="SUBL_0.IND" dx1="2000.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="RegisterServiceFullHTTP.doneRegister" dx1="55.0" dx2="55.0" dy="1200.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1.REQ" Source="LowerVersion.CNF" dx1="55.0" dx2="55.0" dy="670.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_1.REQ" Source="SameVersion.CNF" dx1="55.0" dx2="55.0" dy="765.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2.REQ" Source="OneInterfaceOutOfTwo.CNF" dx1="55.0" dx2="55.0" dy="720.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_2.REQ" Source="OneInterfaceOutOfTwo_2.CNF" dx1="55.0" dx2="55.0" dy="800.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1.REQ" Source="NoInterface.CNF" dx1="55.0" dx2="55.0" dy="820.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1.REQ" Source="WrongInterface.CNF" dx1="55.0" dx2="55.0" dy="715.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1.REQ" Source="OnlyOneMetadata.CNF" dx1="55.0" dx2="55.0" dy="720.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1_1.REQ" Source="NoMetadataAndAsked.CNF" dx1="55.0" dx2="55.0" dy="800.0"/>
+        <Connection Comment="" Destination="RegisterServiceFullHTTP.unregister" Source="WrongMetadaButNotAsked.CNF" dx1="55.0" dx2="55.0" dy="-6965.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="3400.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="RegisterServiceFullHTTP.doneUnregister" dx1="445.0"/>
       </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="FieldsToArrowheadService.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="290.0"/>
+        <Connection Comment="" Destination="LowerVersion.check" Source="F_EQ_4.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="SameVersion.check" Source="F_EQ_4_1.OUT"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="290.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1.service" Source="FieldsToArrowheadService_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="290.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="OneInterfaceOutOfTwo.check" Source="F_EQ_4_1_1.OUT"/>
+        <Connection Comment="" Destination="F_EQ_4_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_1.service" Source="FieldsToArrowheadService_1_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2.OUT" dx1="290.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="OneInterfaceOutOfTwo_2.check" Source="F_EQ_4_1_2.OUT" dx1="390.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2.service" Source="FieldsToArrowheadService_1_2.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1.service" Source="FieldsToArrowheadService_1_2_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="WrongInterface.check" Source="F_EQ_4_1_2_1.OUT" dx1="345.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1.OUT" dx1="290.0"/>
+        <Connection Comment="" Destination="OnlyOneMetadata.check" Source="F_EQ_4_1_2_1_1.OUT" dx1="300.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1.OUT" dx1="225.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1.service" Source="FieldsToArrowheadService_1_2_1_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="NoMetadataAndAsked.check" Source="F_EQ_4_1_2_1_1_1.OUT"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1.OUT" dx1="140.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="NoInterface.check" Source="F_EQ_4_1_2_1_2.OUT" dx1="300.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_2.OUT" dx1="225.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.service" Source="FieldsToArrowheadService_1_2_1_2.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_2.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1_1.OUT" dx1="60.0" dx2="60.0" dy="-30.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.endpoint" dx1="640.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="WrongMetadaButNotAsked.check" Source="F_EQ_4_1_2_1_1_1_1.OUT"/>
+      </DataConnections>
     </SubAppNetwork>
   </Application>
   <Application Comment="" Name="HTTPTest6RegisterMoreServiceSubApp">
     <SubAppNetwork>
-      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="830.0" y="295.0">
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="825.0" y="290.0">
         <Parameter Name="ID" Value="%versionEnded%"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="13505.0" y="10120.0"/>
-      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="11770.0" y="10100.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="13500.0" y="10115.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="11765.0" y="10100.0">
         <Parameter Name="INDEX" Value="1"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="13510.0" y="9145.0"/>
-      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="2185.0" y="3300.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="13505.0" y="9140.0"/>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="2180.0" y="3300.0">
         <Parameter Name="systemName" Value="%systemName%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
       </FB>
-      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="20280.0" y="10735.0">
+      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="20275.0" y="10730.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="11775.0" y="9225.0">
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="11770.0" y="9220.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="Pos1Empty2" Type="TEST_CONDITION" x="21370.0" y="12870.0"/>
-      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="20095.0" y="12815.0">
+      <FB Comment="" Name="Pos1Empty2" Type="TEST_CONDITION" x="21365.0" y="12865.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="20090.0" y="12810.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="Pos1Empty" Type="TEST_CONDITION" x="21530.0" y="10745.0"/>
-      <SubApp Comment="" Name="Sequencer" x="5545.0" y="8170.0">
+      <FB Comment="" Name="Pos1Empty" Type="TEST_CONDITION" x="21525.0" y="10740.0"/>
+      <SubApp Comment="" Name="Sequencer" x="5540.0" y="8165.0">
         <SubAppInterfaceList>
           <SubAppEventInputs>
             <SubAppEvent Comment="" Name="Next" Type="Event"/>
@@ -1288,94 +1290,94 @@
           </SubAppEventOutputs>
         </SubAppInterfaceList>
         <SubAppNetwork>
-          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4240.0" y="150.0"/>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
           <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
-          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6090.0" y="2695.0"/>
-          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3080.0" y="1370.0"/>
-          <FB Comment="" Name="F_GT" Type="F_GT" x="2235.0" y="1365.0">
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
             <Parameter Name="IN2" Value="INT#3"/>
           </FB>
-          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="8255.0" y="2580.0"/>
-          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4835.0" y="2390.0">
+          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="8250.0" y="2575.0"/>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
             <Parameter Name="IN2" Value="INT#4"/>
           </FB>
-          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6010.0" y="4070.0"/>
-          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2240.0" y="2115.0">
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
             <Parameter Name="IN2" Value="INT#7"/>
           </FB>
-          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4870.0" y="3890.0">
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
             <Parameter Name="IN2" Value="INT#8"/>
           </FB>
-          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3090.0" y="2130.0"/>
-          <DataConnections>
-            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1665.0"/>
-            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="150.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="670.0"/>
-            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="355.0"/>
-            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="250.0"/>
-            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
-            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="490.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="230.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="375.0"/>
-          </DataConnections>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
           <EventConnections>
-            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="695.0"/>
-            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="695.0"/>
-            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="695.0"/>
-            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="695.0"/>
-            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="755.0"/>
-            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="755.0"/>
-            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="755.0"/>
-            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="755.0"/>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
             <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF"/>
-            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="155.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="415.0" dx2="60.0" dy="-1430.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="765.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="615.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="615.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="615.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="170.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="170.0"/>
-            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="60.0" dx2="60.0" dy="370.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="230.0"/>
-            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="650.0"/>
-            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="450.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="375.0"/>
-            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1205.0"/>
-            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1205.0"/>
-            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1205.0"/>
-            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1205.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO3" dx1="115.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO0" dx1="880.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO1" dx1="880.0"/>
-            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO2" dx1="880.0"/>
-            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="315.0" dx2="60.0" dy="590.0"/>
-            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1015.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="410.0" dx2="55.0" dy="-1425.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="165.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="445.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1200.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1200.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1200.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1200.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO3" dx1="110.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO0" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO1" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO2" dx1="875.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
           </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+          </DataConnections>
         </SubAppNetwork>
       </SubApp>
-      <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="11780.0" y="12640.0">
+      <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="11775.0" y="12635.0">
         <Parameter Name="INDEX" Value="1"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="13515.0" y="12660.0"/>
-      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_2" Type="GetEndpointFromServiceRegistryEntry" x="13520.0" y="11685.0"/>
-      <FB Comment="" Name="GET_AT_INDEX_2" Type="GET_AT_INDEX" x="11785.0" y="11765.0">
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="13510.0" y="12655.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_2" Type="GetEndpointFromServiceRegistryEntry" x="13515.0" y="11680.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_2" Type="GET_AT_INDEX" x="11780.0" y="11760.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <FB Comment="" Name="Pos0Service1" Type="TEST_CONDITION" x="21445.0" y="10125.0"/>
-      <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="20220.0" y="10105.0">
+      <FB Comment="" Name="Pos0Service1" Type="TEST_CONDITION" x="21440.0" y="10120.0"/>
+      <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="20215.0" y="10100.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="20120.0" y="12025.0">
+      <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="20115.0" y="12020.0">
         <Parameter Name="IN1" Value="%validEndpoint2%"/>
       </FB>
-      <FB Comment="" Name="Pos0Service2" Type="TEST_CONDITION" x="21345.0" y="12045.0"/>
-      <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="9080.0" y="7590.0">
+      <FB Comment="" Name="Pos0Service2" Type="TEST_CONDITION" x="21340.0" y="12040.0"/>
+      <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="10500.0" y="700.0">
         <Parameter Name="ID" Value="%test6Ended%"/>
       </FB>
-      <SubApp Comment="" Name="QuerySecondService" Type="QueryServiceHTTPSubFull" x="8800.0" y="11670.0">
+      <SubApp Comment="" Name="QuerySecondService" Type="QueryServiceHTTPSubFull" x="8800.0" y="11665.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
@@ -1383,7 +1385,7 @@
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <SubApp Comment="" Name="QueryFirstService" Type="QueryServiceHTTPSubFull" x="8725.0" y="9625.0">
+      <SubApp Comment="" Name="QueryFirstService" Type="QueryServiceHTTPSubFull" x="8720.0" y="9620.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
@@ -1391,25 +1393,25 @@
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="address" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="20020.0" y="14740.0">
+      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="20015.0" y="14735.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="F_EQ_3_1_1" Type="F_EQ" x="20045.0" y="13950.0">
+      <FB Comment="" Name="F_EQ_3_1_1" Type="F_EQ" x="20040.0" y="13945.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="Pos1Empty3" Type="TEST_CONDITION" x="21295.0" y="14795.0"/>
-      <FB Comment="" Name="Pos0Empty3" Type="TEST_CONDITION" x="21270.0" y="13970.0"/>
-      <FB Comment="" Name="F_EQ_1_1_1" Type="F_EQ" x="19960.0" y="16265.0">
+      <FB Comment="" Name="Pos1Empty3" Type="TEST_CONDITION" x="21290.0" y="14790.0"/>
+      <FB Comment="" Name="Pos0Empty3" Type="TEST_CONDITION" x="21265.0" y="13965.0"/>
+      <FB Comment="" Name="F_EQ_1_1_1" Type="F_EQ" x="19955.0" y="16260.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="Pos0Empty4" Type="TEST_CONDITION" x="21210.0" y="15495.0"/>
-      <FB Comment="" Name="Pos1Empty4" Type="TEST_CONDITION" x="21235.0" y="16320.0"/>
-      <FB Comment="" Name="F_EQ_3_1_1_1" Type="F_EQ" x="19985.0" y="15475.0">
+      <FB Comment="" Name="Pos0Empty4" Type="TEST_CONDITION" x="21205.0" y="15490.0"/>
+      <FB Comment="" Name="Pos1Empty4" Type="TEST_CONDITION" x="21230.0" y="16315.0"/>
+      <FB Comment="" Name="F_EQ_3_1_1_1" Type="F_EQ" x="19980.0" y="15470.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="22650.0" y="13335.0"/>
-      <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="15460.0" y="11025.0"/>
-      <SubApp Comment="" Name="RegisterManyServices" Type="RegisterMultipleServicesHTTP" x="6460.0" y="4230.0">
+      <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="22645.0" y="13330.0"/>
+      <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="15455.0" y="11020.0"/>
+      <SubApp Comment="" Name="RegisterManyServices" Type="RegisterMultipleServicesHTTP" x="6455.0" y="4225.0">
         <Parameter Name="serviceDefinition" Value="[&quot;serviceTest&quot;, &quot;serviceTest2&quot;]"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
@@ -1419,121 +1421,121 @@
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SREndpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <DataConnections>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.serviceRegistryEntry" Source="GET_AT_INDEX_2.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="Pos1Empty2.check" Source="F_EQ_1.OUT" dx1="435.0"/>
-        <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="3390.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="Pos1Empty.check" Source="F_EQ_2.OUT" dx1="430.0"/>
-        <Connection Comment="" Destination="Pos0Service2.check" Source="F_EQ_3_1.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3050.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="580.0"/>
-        <Connection Comment="" Destination="Pos0Service1.check" Source="F_EQ_3.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryFirstService.serviceEntries" dx1="1050.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryFirstService.serviceEntries" dx1="1075.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QuerySecondService.serviceEntries" dx1="1300.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_2.IN_ARRAY" Source="QuerySecondService.serviceEntries" dx1="940.0"/>
-        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="3710.0"/>
-        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="3220.0"/>
-        <Connection Comment="" Destination="Pos0Empty3.check" Source="F_EQ_3_1_1.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="Pos1Empty3.check" Source="F_EQ_1_1.OUT" dx1="445.0"/>
-        <Connection Comment="" Destination="Pos0Empty4.check" Source="F_EQ_3_1_1_1.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="Pos1Empty4.check" Source="F_EQ_1_1_1.OUT" dx1="445.0"/>
-        <Connection Comment="" Destination="RegisterManyServices.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1490.0"/>
-        <Connection Comment="" Destination="F_EQ_3_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2595.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2545.0"/>
-        <Connection Comment="" Destination="F_EQ_3_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="2520.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="2470.0"/>
-      </DataConnections>
       <EventConnections>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="785.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="GET_AT_INDEX_2.CNF" dx1="60.0" dx2="60.0" dy="440.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="575.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
-        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_2.CNF" dx1="60.0" dx2="60.0" dy="440.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="860.0"/>
-        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryFirstService.CNF" dx1="830.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="780.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="55.0" dx2="55.0" dy="430.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="GET_AT_INDEX_2.CNF" dx1="55.0" dx2="55.0" dy="435.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="570.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="55.0" dx2="55.0" dy="480.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_2.CNF" dx1="55.0" dx2="55.0" dy="435.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="790.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryFirstService.CNF" dx1="825.0"/>
         <Connection Comment="" Destination="GET_AT_INDEX_2.REQ" Source="QuerySecondService.CNF" dx1="1200.0"/>
-        <Connection Comment="" Destination="F_EQ_2.REQ" Source="F_EQ_3.CNF" dx1="60.0" dx2="60.0" dy="250.0"/>
-        <Connection Comment="" Destination="Pos0Service1.REQ" Source="F_EQ_2.CNF" dx1="430.0"/>
-        <Connection Comment="" Destination="Pos1Empty.REQ" Source="Pos0Service1.CNF" dx1="60.0" dx2="60.0" dy="310.0"/>
-        <Connection Comment="" Destination="F_EQ_1.REQ" Source="F_EQ_3_1.CNF" dx1="60.0" dx2="60.0" dy="475.0"/>
-        <Connection Comment="" Destination="Pos0Service2.REQ" Source="F_EQ_1.CNF" dx1="435.0"/>
-        <Connection Comment="" Destination="Pos1Empty2.REQ" Source="Pos0Service2.CNF" dx1="60.0" dx2="60.0" dy="460.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToArrowheadSystem.CNF" dx1="1035.0"/>
-        <Connection Comment="" Destination="Pos0Empty3.REQ" Source="F_EQ_3_1_1.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="Pos1Empty3.REQ" Source="F_EQ_1_1.CNF" dx1="445.0"/>
-        <Connection Comment="" Destination="Pos1Empty4.REQ" Source="F_EQ_1_1_1.CNF" dx1="445.0"/>
-        <Connection Comment="" Destination="Pos0Empty4.REQ" Source="F_EQ_3_1_1_1.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Pos0Empty3.CNF" dx1="60.0" dx2="60.0" dy="385.0"/>
-        <Connection Comment="" Destination="F_EQ_1_1_1.REQ" Source="Pos0Empty4.CNF" dx1="60.0" dx2="60.0" dy="380.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="60.0" dx2="60.0" dy="5560.0"/>
-        <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty.CNF" dx1="210.0"/>
-        <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty2.CNF" dx1="290.0"/>
-        <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty3.CNF" dx1="330.0"/>
-        <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty4.CNF" dx1="360.0"/>
+        <Connection Comment="" Destination="F_EQ_2.REQ" Source="F_EQ_3.CNF" dx1="55.0" dx2="55.0" dy="245.0"/>
+        <Connection Comment="" Destination="Pos0Service1.REQ" Source="F_EQ_2.CNF" dx1="425.0"/>
+        <Connection Comment="" Destination="Pos1Empty.REQ" Source="Pos0Service1.CNF" dx1="55.0" dx2="55.0" dy="305.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="F_EQ_3_1.CNF" dx1="55.0" dx2="55.0" dy="470.0"/>
+        <Connection Comment="" Destination="Pos0Service2.REQ" Source="F_EQ_1.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="Pos1Empty2.REQ" Source="Pos0Service2.CNF" dx1="55.0" dx2="55.0" dy="455.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToArrowheadSystem.CNF" dx1="1030.0"/>
+        <Connection Comment="" Destination="Pos0Empty3.REQ" Source="F_EQ_3_1_1.CNF" dx1="415.0"/>
+        <Connection Comment="" Destination="Pos1Empty3.REQ" Source="F_EQ_1_1.CNF" dx1="440.0"/>
+        <Connection Comment="" Destination="Pos1Empty4.REQ" Source="F_EQ_1_1_1.CNF" dx1="440.0"/>
+        <Connection Comment="" Destination="Pos0Empty4.REQ" Source="F_EQ_3_1_1_1.CNF" dx1="415.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Pos0Empty3.CNF" dx1="55.0" dx2="55.0" dy="380.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1_1.REQ" Source="Pos0Empty4.CNF" dx1="55.0" dx2="55.0" dy="375.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="55.0" dx2="55.0" dy="5555.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty.CNF" dx1="205.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty2.CNF" dx1="285.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty3.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty4.CNF" dx1="355.0"/>
         <Connection Comment="" Destination="F_EQ_3.REQ" Source="Sequencer.E2" dx1="13100.0"/>
         <Connection Comment="" Destination="QueryFirstService.REQ" Source="Sequencer.E1" dx1="1400.0"/>
-        <Connection Comment="" Destination="E_MERGE_1.EI1" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="265.0"/>
-        <Connection Comment="" Destination="E_MERGE_1.EI2" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="220.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="60.0" dx2="60.0" dy="-1430.0"/>
-        <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="Sequencer.E4" dx1="7095.0"/>
-        <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E3" dx1="990.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI1" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="200.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI2" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="120.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="55.0" dx2="55.0" dy="-1425.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="Sequencer.E4" dx1="7090.0"/>
+        <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E3" dx1="985.0"/>
         <Connection Comment="" Destination="QueryFirstService.REQ" Source="Sequencer.E6" dx1="1400.0"/>
-        <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E8" dx1="1435.0"/>
-        <Connection Comment="" Destination="PUBL_0_1.INIT" Source="Sequencer.E10" dx1="1575.0"/>
-        <Connection Comment="" Destination="PUBL_0_1.REQ" Source="PUBL_0_1.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
-        <Connection Comment="" Destination="F_EQ_3_1_1.REQ" Source="Sequencer.E7" dx1="1810.0"/>
-        <Connection Comment="" Destination="F_EQ_3_1_1_1.REQ" Source="Sequencer.E9" dx1="7060.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.registerDone" dx1="60.0" dx2="60.0" dy="1970.0"/>
-        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.unregisterUndone" dx1="60.0" dx2="60.0" dy="1920.0"/>
-        <Connection Comment="" Destination="RegisterManyServices.unregister" Source="Sequencer.E5" dx1="385.0"/>
-        <Connection Comment="" Destination="RegisterManyServices.register" Source="Sequencer.E0" dx1="265.0"/>
+        <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E8" dx1="1430.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1_1.REQ" Source="Sequencer.E7" dx1="1805.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1_1_1.REQ" Source="Sequencer.E9" dx1="7055.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.registerDone" dx1="55.0" dx2="55.0" dy="1965.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.unregisterUndone" dx1="55.0" dx2="55.0" dy="1915.0"/>
+        <Connection Comment="" Destination="RegisterManyServices.unregister" Source="Sequencer.E5" dx1="380.0"/>
+        <Connection Comment="" Destination="RegisterManyServices.register" Source="Sequencer.E0" dx1="260.0"/>
+        <Connection Comment="" Destination="PUBL_0_1.REQ" Source="Sequencer.E10" dx1="1570.0"/>
+        <Connection Comment="" Destination="PUBL_0_1.INIT" Source="SUBL_0.INITO" dx1="4590.0"/>
       </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.serviceRegistryEntry" Source="GET_AT_INDEX_2.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="Pos1Empty2.check" Source="F_EQ_1.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="3385.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="Pos1Empty.check" Source="F_EQ_2.OUT" dx1="440.0"/>
+        <Connection Comment="" Destination="Pos0Service2.check" Source="F_EQ_3_1.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3045.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="Pos0Service1.check" Source="F_EQ_3.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryFirstService.serviceEntries" dx1="1045.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryFirstService.serviceEntries" dx1="1070.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QuerySecondService.serviceEntries" dx1="1300.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_2.IN_ARRAY" Source="QuerySecondService.serviceEntries" dx1="935.0"/>
+        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="3705.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="3215.0"/>
+        <Connection Comment="" Destination="Pos0Empty3.check" Source="F_EQ_3_1_1.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="Pos1Empty3.check" Source="F_EQ_1_1.OUT" dx1="440.0"/>
+        <Connection Comment="" Destination="Pos0Empty4.check" Source="F_EQ_3_1_1_1.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="Pos1Empty4.check" Source="F_EQ_1_1_1.OUT" dx1="440.0"/>
+        <Connection Comment="" Destination="RegisterManyServices.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1485.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2590.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2540.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="2515.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="2465.0"/>
+      </DataConnections>
     </SubAppNetwork>
   </Application>
   <Application Comment="" Name="HTTPTest7OrchestrationNoRules">
     <SubAppNetwork>
-      <FB Comment="" Name="RequestOrchestrationHTTP" Type="RequestOrchestrationHTTP" x="13710.0" y="2410.0"/>
-      <FB Comment="" Name="FieldsToServiceRequestForm" Type="FieldsToServiceRequestForm" x="9055.0" y="135.0"/>
-      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="6660.0" y="-840.0">
+      <FB Comment="" Name="RequestOrchestrationHTTP" Type="RequestOrchestrationHTTP" x="13705.0" y="2405.0"/>
+      <FB Comment="" Name="FieldsToServiceRequestForm" Type="FieldsToServiceRequestForm" x="9050.0" y="130.0"/>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="6655.0" y="-835.0">
         <Parameter Name="systemName" Value="%systemName%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
       </FB>
-      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="6650.0" y="460.0">
+      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="6645.0" y="455.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <SubApp Comment="" Name="GetEndpointFromOrchestrationForm" Type="GetEndpointFromOrchestrationForm" x="14845.0" y="1300.0"/>
-      <FB Comment="" Name="F_EQ" Type="F_EQ" x="16865.0" y="1215.0">
+      <SubApp Comment="" Name="GetEndpointFromOrchestrationForm" Type="GetEndpointFromOrchestrationForm" x="14840.0" y="1300.0"/>
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="16860.0" y="1210.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="NoServiceAvailable" Type="TEST_CONDITION" x="18090.0" y="1220.0"/>
-      <FB Comment="" Name="SERVER_1" Type="SERVER_1" x="9940.0" y="4450.0">
+      <FB Comment="" Name="NoServiceAvailable" Type="TEST_CONDITION" x="18085.0" y="1215.0"/>
+      <FB Comment="" Name="SERVER_1" Type="SERVER_1" x="9935.0" y="4445.0">
         <Parameter Name="ID" Value="http[/serviceTest/start2]"/>
       </FB>
-      <FB Comment="" Name="E_SR" Type="E_SR" x="9240.0" y="4360.0"/>
-      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialHTTP" x="9195.0" y="2360.0">
+      <FB Comment="" Name="E_SR" Type="E_SR" x="9235.0" y="4355.0"/>
+      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialHTTP" x="9190.0" y="2355.0">
         <Parameter Name="serviceURI" Value="%serviceURI2%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="4140.0" y="-1140.0">
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="4135.0" y="-1135.0">
         <Parameter Name="ID" Value="%test6Ended%"/>
       </FB>
-      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="4000.0" y="5680.0">
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="4000.0" y="5675.0">
         <Parameter Name="ID" Value="%test7Ended%"/>
       </FB>
-      <FB Comment="" Name="GET_STRUCT_VALUE1" Type="GET_AT_INDEX" x="13670.0" y="1275.0">
+      <FB Comment="" Name="GET_STRUCT_VALUE1" Type="GET_AT_INDEX" x="13665.0" y="1270.0">
         <Parameter Name="INDEX" Value="0"/>
       </FB>
-      <SubApp Comment="" Name="Sequencer_1" x="155.0" y="2575.0">
+      <SubApp Comment="" Name="Sequencer_1" x="150.0" y="2570.0">
         <SubAppInterfaceList>
           <SubAppEventInputs>
             <SubAppEvent Comment="" Name="Next" Type="Event"/>
@@ -1554,154 +1556,154 @@
           </SubAppEventOutputs>
         </SubAppInterfaceList>
         <SubAppNetwork>
-          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4240.0" y="150.0"/>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
           <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
-          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6090.0" y="2695.0"/>
-          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3080.0" y="1370.0"/>
-          <FB Comment="" Name="F_GT" Type="F_GT" x="2235.0" y="1365.0">
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
             <Parameter Name="IN2" Value="INT#3"/>
           </FB>
-          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4835.0" y="2390.0">
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
             <Parameter Name="IN2" Value="INT#4"/>
           </FB>
-          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6010.0" y="4070.0"/>
-          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2240.0" y="2115.0">
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
             <Parameter Name="IN2" Value="INT#7"/>
           </FB>
-          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4870.0" y="3890.0">
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
             <Parameter Name="IN2" Value="INT#8"/>
           </FB>
-          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3090.0" y="2130.0"/>
-          <DataConnections>
-            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1665.0"/>
-            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="150.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="670.0"/>
-            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="355.0"/>
-            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="250.0"/>
-            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
-            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="490.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="230.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="375.0"/>
-          </DataConnections>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
           <EventConnections>
-            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="695.0"/>
-            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="695.0"/>
-            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="695.0"/>
-            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="695.0"/>
-            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="755.0"/>
-            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="755.0"/>
-            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="755.0"/>
-            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="755.0"/>
-            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="230.0"/>
-            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="155.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="765.0"/>
-            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="60.0" dx2="60.0" dy="370.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="230.0"/>
-            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="650.0"/>
-            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="450.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="375.0"/>
-            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1205.0"/>
-            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1205.0"/>
-            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1205.0"/>
-            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1205.0"/>
-            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="315.0" dx2="60.0" dy="590.0"/>
-            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1015.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO3" dx1="60.0" dx2="60.0" dy="530.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO2" dx1="60.0" dx2="60.0" dy="735.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO1" dx1="60.0" dx2="60.0" dy="810.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO0" dx1="60.0" dx2="60.0" dy="745.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO2" dx1="60.0" dx2="60.0" dy="-1125.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO1" dx1="60.0" dx2="60.0" dy="-825.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO0" dx1="60.0" dx2="60.0" dy="-965.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO3" dx1="60.0" dx2="60.0" dy="-375.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO2" dx1="60.0" dx2="60.0" dy="-415.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO1" dx1="60.0" dx2="60.0" dy="-330.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO0" dx1="60.0" dx2="60.0" dy="-475.0"/>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="445.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1200.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1200.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1200.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1200.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO3" dx1="55.0" dx2="55.0" dy="525.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO2" dx1="55.0" dx2="55.0" dy="730.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO1" dx1="55.0" dx2="55.0" dy="805.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO0" dx1="55.0" dx2="55.0" dy="740.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO2" dx1="55.0" dx2="55.0" dy="-1120.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO1" dx1="55.0" dx2="55.0" dy="-820.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO0" dx1="55.0" dx2="55.0" dy="-960.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO3" dx1="55.0" dx2="55.0" dy="-370.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO2" dx1="55.0" dx2="55.0" dy="-410.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO1" dx1="55.0" dx2="55.0" dy="-325.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO0" dx1="55.0" dx2="55.0" dy="-470.0"/>
           </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+          </DataConnections>
         </SubAppNetwork>
       </SubApp>
-      <FB Comment="" Name="RequestOrchestrationForm" Type="RequestOrchestrationForm" x="11680.0" y="1805.0">
+      <FB Comment="" Name="RequestOrchestrationForm" Type="RequestOrchestrationForm" x="11675.0" y="1800.0">
         <Parameter Name="endpoint" Value="%orchestratorAddress%"/>
       </FB>
-      <DataConnections>
-        <Connection Comment="" Destination="FieldsToServiceRequestForm.requesterSystem" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="550.0"/>
-        <Connection Comment="" Destination="FieldsToServiceRequestForm.requestedService" Source="Service1.arrowheadService" dx1="580.0"/>
-        <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationForm.endpoint" dx1="370.0"/>
-        <Connection Comment="" Destination="SERVER_1.QI" Source="E_SR.Q" dx1="220.0"/>
-        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="80.0"/>
-        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="155.0"/>
-        <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.orchestrationForm" Source="GET_STRUCT_VALUE1.OUT" dx1="210.0"/>
-        <Connection Comment="" Destination="RequestOrchestrationForm.serviceRequestForm" Source="FieldsToServiceRequestForm.serviceRequestForm" dx1="350.0"/>
-        <Connection Comment="" Destination="GET_STRUCT_VALUE1.IN_ARRAY" Source="RequestOrchestrationForm.orchestrationResponse" dx1="305.0"/>
-      </DataConnections>
       <EventConnections>
-        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="650.0"/>
-        <Connection Comment="" Destination="FieldsToServiceRequestForm.REQ" Source="Service1.CNF" dx1="580.0"/>
-        <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromOrchestrationForm.CNF" dx1="370.0"/>
-        <Connection Comment="" Destination="SERVER_1.INIT" Source="E_SR.EO" dx1="220.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="1045.0"/>
-        <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.REQ" Source="GET_STRUCT_VALUE1.CNF" dx1="205.0"/>
-        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer_1.E1" dx1="3750.0"/>
-        <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E3" dx1="6810.0"/>
-        <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E5" dx1="7310.0"/>
+        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="55.0" dx2="55.0" dy="645.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRequestForm.REQ" Source="Service1.CNF" dx1="575.0"/>
+        <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromOrchestrationForm.CNF" dx1="365.0"/>
+        <Connection Comment="" Destination="SERVER_1.INIT" Source="E_SR.EO" dx1="215.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="1040.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.REQ" Source="GET_STRUCT_VALUE1.CNF" dx1="200.0"/>
+        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer_1.E1" dx1="3745.0"/>
+        <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E3" dx1="6805.0"/>
+        <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E5" dx1="7305.0"/>
         <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E7" dx1="6900.0"/>
-        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer_1.E8" dx1="5290.0"/>
-        <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E10" dx1="7510.0"/>
-        <Connection Comment="" Destination="PUBL_0.INIT" Source="Sequencer_1.E11" dx1="1760.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="NoServiceAvailable.CNF" dx1="60.0" dx2="60.0" dy="6100.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneUnregister" dx1="425.0" dx2="200.0" dy="-4220.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneRegister" dx1="60.0" dx2="60.0" dy="-3770.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="FieldsToServiceRequestForm.CNF" dx1="60.0" dx2="530.0" dy="-2190.0"/>
-        <Connection Comment="" Destination="PUBL_0.REQ" Source="PUBL_0.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="SERVER_1.INITO" dx1="60.0" dx2="520.0" dy="2120.0"/>
-        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E0" dx1="3390.0"/>
-        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E2" dx1="4110.0"/>
-        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E4" dx1="4760.0"/>
-        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E6" dx1="4990.0"/>
-        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E9" dx1="5580.0"/>
-        <Connection Comment="" Destination="GET_STRUCT_VALUE1.REQ" Source="RequestOrchestrationForm.responseReceived" dx1="240.0"/>
+        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer_1.E8" dx1="5285.0"/>
+        <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E10" dx1="7505.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="NoServiceAvailable.CNF" dx1="55.0" dx2="55.0" dy="6100.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneUnregister" dx1="420.0" dx2="200.0" dy="-4215.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneRegister" dx1="55.0" dx2="55.0" dy="-3765.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="FieldsToServiceRequestForm.CNF" dx1="55.0" dx2="525.0" dy="-2185.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="SERVER_1.INITO" dx1="55.0" dx2="515.0" dy="2115.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E0" dx1="3385.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E2" dx1="4105.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E4" dx1="4755.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E6" dx1="4985.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E9" dx1="5575.0"/>
+        <Connection Comment="" Destination="GET_STRUCT_VALUE1.REQ" Source="RequestOrchestrationForm.responseReceived" dx1="60.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1.E11" dx1="1755.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="60.0" dx2="60.0" dy="3405.0"/>
       </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="FieldsToServiceRequestForm.requesterSystem" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="545.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRequestForm.requestedService" Source="Service1.arrowheadService" dx1="575.0"/>
+        <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationForm.endpoint" dx1="365.0"/>
+        <Connection Comment="" Destination="SERVER_1.QI" Source="E_SR.Q" dx1="215.0"/>
+        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="75.0"/>
+        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="150.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.orchestrationForm" Source="GET_STRUCT_VALUE1.OUT" dx1="205.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.serviceRequestForm" Source="FieldsToServiceRequestForm.serviceRequestForm" dx1="345.0"/>
+        <Connection Comment="" Destination="GET_STRUCT_VALUE1.IN_ARRAY" Source="RequestOrchestrationForm.orchestrationResponse" dx1="60.0"/>
+      </DataConnections>
       <AdapterConnections>
-        <Connection Comment="" Destination="RequestOrchestrationHTTP.requestOrchestration" Source="RequestOrchestrationForm.requestOrchestration" dx1="460.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationHTTP.requestOrchestration" Source="RequestOrchestrationForm.requestOrchestration" dx1="100.0"/>
       </AdapterConnections>
     </SubAppNetwork>
   </Application>
   <Application Comment="" Name="HTTPTest8OrchestrationWithRules">
     <SubAppNetwork>
-      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="7490.0" y="1095.0">
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="7485.0" y="1090.0">
         <Parameter Name="systemName" Value="%systemName%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
       </FB>
-      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="7480.0" y="2395.0">
+      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="7475.0" y="2390.0">
         <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
         <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
         <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
       </FB>
-      <FB Comment="" Name="F_EQ" Type="F_EQ" x="19625.0" y="3100.0">
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="19620.0" y="3100.0">
         <Parameter Name="IN1" Value="%emptyEndpoint%"/>
       </FB>
-      <FB Comment="" Name="NoServiceAvailable" Type="TEST_CONDITION" x="20850.0" y="3105.0"/>
-      <FB Comment="" Name="SERVER_1" Type="SERVER_1" x="10770.0" y="6385.0">
+      <FB Comment="" Name="NoServiceAvailable" Type="TEST_CONDITION" x="20845.0" y="3100.0"/>
+      <FB Comment="" Name="SERVER_1" Type="SERVER_1" x="10765.0" y="6380.0">
         <Parameter Name="ID" Value="http[/serviceTest/start]"/>
       </FB>
-      <FB Comment="" Name="E_SR" Type="E_SR" x="10070.0" y="6295.0"/>
-      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialHTTP" x="10025.0" y="4295.0">
+      <FB Comment="" Name="E_SR" Type="E_SR" x="10065.0" y="6290.0"/>
+      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialHTTP" x="10020.0" y="4290.0">
         <Parameter Name="serviceURI" Value="%serviceURI%"/>
         <Parameter Name="version" Value="%serviceVersion%"/>
         <Parameter Name="udp" Value="false"/>
         <Parameter Name="metadata" Value="%metadata%"/>
         <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
       </SubApp>
-      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="4970.0" y="795.0">
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="4965.0" y="790.0">
         <Parameter Name="ID" Value="%test7Ended%"/>
       </FB>
-      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="4830.0" y="7615.0">
-        <Parameter Name="ID" Value="%allEnded%"/>
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="4825.0" y="7610.0">
+        <Parameter Name="ID" Value="%test8Ended%"/>
       </FB>
-      <SubApp Comment="" Name="Sequencer_1" x="985.0" y="4510.0">
+      <SubApp Comment="" Name="Sequencer_1" x="980.0" y="4505.0">
         <SubAppInterfaceList>
           <SubAppEventInputs>
             <SubAppEvent Comment="" Name="Next" Type="Event"/>
@@ -1726,118 +1728,115 @@
           </SubAppEventOutputs>
         </SubAppInterfaceList>
         <SubAppNetwork>
-          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4240.0" y="150.0"/>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
           <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
-          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6090.0" y="2695.0"/>
-          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3035.0" y="275.0"/>
-          <FB Comment="" Name="F_GT" Type="F_GT" x="2190.0" y="270.0">
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3030.0" y="270.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2185.0" y="265.0">
             <Parameter Name="IN2" Value="INT#3"/>
           </FB>
-          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4835.0" y="2390.0">
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
             <Parameter Name="IN2" Value="INT#4"/>
           </FB>
-          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6010.0" y="4070.0"/>
-          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2240.0" y="2115.0">
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
             <Parameter Name="IN2" Value="INT#7"/>
           </FB>
-          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4870.0" y="3890.0">
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
             <Parameter Name="IN2" Value="INT#8"/>
           </FB>
-          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3090.0" y="2130.0"/>
-          <FB Comment="" Name="F_GT_1_1" Type="F_GT" x="2160.0" y="3580.0">
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
+          <FB Comment="" Name="F_GT_1_1" Type="F_GT" x="2155.0" y="3575.0">
             <Parameter Name="IN2" Value="INT#11"/>
           </FB>
-          <FB Comment="" Name="E_SWITCH_1_1" Type="E_SWITCH" x="3010.0" y="3595.0"/>
-          <FB Comment="" Name="E_DEMUX_1_1_1" Type="E_DEMUX" x="5950.0" y="5350.0"/>
-          <FB Comment="" Name="F_SUB_1_1" Type="F_SUB" x="4810.0" y="5170.0">
+          <FB Comment="" Name="E_SWITCH_1_1" Type="E_SWITCH" x="3005.0" y="3590.0"/>
+          <FB Comment="" Name="E_DEMUX_1_1_1" Type="E_DEMUX" x="5945.0" y="5345.0"/>
+          <FB Comment="" Name="F_SUB_1_1" Type="F_SUB" x="4805.0" y="5165.0">
             <Parameter Name="IN2" Value="INT#12"/>
           </FB>
-          <DataConnections>
-            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1665.0"/>
-            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="150.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="670.0"/>
-            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="355.0"/>
-            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="250.0"/>
-            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
-            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="490.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="230.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="375.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1_1.G" Source="F_GT_1_1.OUT" dx1="230.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1_1.K" Source="F_SUB_1_1.OUT" dx1="375.0"/>
-            <Connection Comment="" Destination="F_SUB_1_1.IN1" Source="E_CTU.CV" dx1="1775.0"/>
-            <Connection Comment="" Destination="F_GT_1_1.IN1" Source="E_CTU.CV" dx1="450.0"/>
-          </DataConnections>
           <EventConnections>
-            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="695.0"/>
-            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="695.0"/>
-            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="695.0"/>
-            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="695.0"/>
-            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="695.0"/>
-            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="695.0"/>
-            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="695.0"/>
-            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="695.0"/>
-            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="230.0"/>
-            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="155.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="765.0"/>
-            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="60.0" dx2="60.0" dy="370.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="230.0"/>
-            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="650.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="375.0"/>
-            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="715.0"/>
-            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="715.0"/>
-            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="715.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO3" dx1="60.0" dx2="60.0" dy="530.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO2" dx1="60.0" dx2="60.0" dy="735.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO1" dx1="60.0" dx2="60.0" dy="810.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO0" dx1="60.0" dx2="60.0" dy="745.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO2" dx1="60.0" dx2="60.0" dy="-1125.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO1" dx1="60.0" dx2="60.0" dy="-825.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO0" dx1="60.0" dx2="60.0" dy="-965.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO3" dx1="60.0" dx2="60.0" dy="-375.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO2" dx1="60.0" dx2="60.0" dy="-415.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO1" dx1="60.0" dx2="60.0" dy="-330.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO0" dx1="60.0" dx2="60.0" dy="-475.0"/>
-            <Connection Comment="" Destination="E_SWITCH_1_1.EI" Source="F_GT_1_1.CNF" dx1="230.0"/>
-            <Connection Comment="" Destination="E_DEMUX_1_1_1.EI" Source="F_SUB_1_1.CNF" dx1="375.0"/>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="710.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="710.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="710.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO3" dx1="55.0" dx2="55.0" dy="525.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO2" dx1="55.0" dx2="55.0" dy="730.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO1" dx1="55.0" dx2="55.0" dy="805.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO0" dx1="55.0" dx2="55.0" dy="740.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO2" dx1="55.0" dx2="55.0" dy="-1120.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO1" dx1="55.0" dx2="55.0" dy="-820.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO0" dx1="55.0" dx2="55.0" dy="-960.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO3" dx1="55.0" dx2="55.0" dy="-370.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO2" dx1="55.0" dx2="55.0" dy="-410.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO1" dx1="55.0" dx2="55.0" dy="-325.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO0" dx1="55.0" dx2="55.0" dy="-470.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1_1.EI" Source="F_GT_1_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1_1.EI" Source="F_SUB_1_1.CNF" dx1="370.0"/>
             <Connection Comment="" Destination="E12" Source="E_DEMUX_1_1_1.EO0" dx1="700.0"/>
             <Connection Comment="" Destination="E13" Source="E_DEMUX_1_1_1.EO1" dx1="700.0"/>
             <Connection Comment="" Destination="E14" Source="E_DEMUX_1_1_1.EO2" dx1="700.0"/>
             <Connection Comment="" Destination="E15" Source="E_DEMUX_1_1_1.EO3" dx1="700.0"/>
-            <Connection Comment="" Destination="F_GT_1_1.REQ" Source="E_SWITCH_1.EO1" dx1="60.0" dx2="60.0" dy="770.0"/>
-            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1_1.EO0" dx1="685.0"/>
-            <Connection Comment="" Destination="F_SUB_1_1.REQ" Source="E_SWITCH_1_1.EO1" dx1="655.0"/>
-            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1_1.EO3" dx1="315.0" dx2="60.0" dy="590.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO0" dx1="60.0" dx2="60.0" dy="-2425.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO1" dx1="60.0" dx2="60.0" dy="-2475.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO2" dx1="60.0" dx2="60.0" dy="-2525.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO3" dx1="60.0" dx2="60.0" dy="-2575.0"/>
-            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="715.0"/>
-            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO3" dx1="60.0" dx2="60.0" dy="-1935.0"/>
-            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="995.0"/>
+            <Connection Comment="" Destination="F_GT_1_1.REQ" Source="E_SWITCH_1.EO1" dx1="55.0" dx2="55.0" dy="765.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1_1.EO0" dx1="680.0"/>
+            <Connection Comment="" Destination="F_SUB_1_1.REQ" Source="E_SWITCH_1_1.EO1" dx1="650.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO0" dx1="55.0" dx2="55.0" dy="-2420.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO1" dx1="55.0" dx2="55.0" dy="-2470.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO2" dx1="55.0" dx2="55.0" dy="-2520.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO3" dx1="55.0" dx2="55.0" dy="-2570.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="710.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO3" dx1="55.0" dx2="55.0" dy="-1930.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="990.0"/>
           </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1_1.G" Source="F_GT_1_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1_1.K" Source="F_SUB_1_1.OUT" dx1="370.0"/>
+            <Connection Comment="" Destination="F_SUB_1_1.IN1" Source="E_CTU.CV" dx1="1770.0"/>
+            <Connection Comment="" Destination="F_GT_1_1.IN1" Source="E_CTU.CV" dx1="445.0"/>
+          </DataConnections>
         </SubAppNetwork>
       </SubApp>
-      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="19580.0" y="4070.0">
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="19575.0" y="4065.0">
         <Parameter Name="IN1" Value="%validEndpoint%"/>
       </FB>
-      <FB Comment="" Name="ServiceAvailable" Type="TEST_CONDITION" x="20805.0" y="4075.0"/>
-      <FB Comment="" Name="E_SR_1" Type="E_SR" x="17125.0" y="2225.0"/>
-      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="18145.0" y="2250.0"/>
-      <FB Comment="" Name="CLIENT_1_2" Type="CLIENT_1_2" x="14025.0" y="565.0">
+      <FB Comment="" Name="ServiceAvailable" Type="TEST_CONDITION" x="20800.0" y="4070.0"/>
+      <FB Comment="" Name="E_SR_1" Type="E_SR" x="17120.0" y="2220.0"/>
+      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="18140.0" y="2245.0"/>
+      <FB Comment="" Name="CLIENT_1_2" Type="CLIENT_1_2" x="14020.0" y="560.0">
         <Parameter Name="QI" Value="1"/>
         <Parameter Name="ID" Value="http[%authRuleEndpoint%; POST; application/json]]"/>
         <Parameter Name="SD_1" Value="STRING#%authRuleData%"/>
       </FB>
-      <FB Comment="" Name="CLIENT_1_2_1" Type="CLIENT_1_2" x="16785.0" y="585.0">
+      <FB Comment="" Name="CLIENT_1_2_1" Type="CLIENT_1_2" x="16780.0" y="580.0">
         <Parameter Name="QI" Value="1"/>
         <Parameter Name="ID" Value="http[%orchStoreEndpoint%; POST; application/json]]"/>
         <Parameter Name="SD_1" Value="STRING#%orchRuleData%"/>
       </FB>
-      <FB Comment="" Name="STRING2STRING" Type="STRING2STRING" x="11510.0" y="6950.0"/>
-      <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="6165.0" y="320.0">
-        <Parameter Name="ID" Value="%allLoaded%"/>
-      </FB>
-      <SubApp Comment="" Name="GetEndpointFromOrchestrationHTTPPFull" Type="GetEndpointFromOrchestrationHTTPPFull" x="12235.0" y="2975.0">
+      <FB Comment="" Name="STRING2STRING" Type="STRING2STRING" x="11505.0" y="6945.0"/>
+      <SubApp Comment="" Name="GetEndpointFromOrchestrationHTTPPFull" Type="GetEndpointFromOrchestrationHTTPPFull" x="12900.0" y="2900.0">
         <Parameter Name="systemName" Value="%systemName%"/>
         <Parameter Name="address" Value="%testAddress%"/>
         <Parameter Name="port" Value="%systemPort%"/>
@@ -1847,61 +1846,2452 @@
         <Parameter Name="orchestratorEndpoint" Value="%orchestratorAddress%"/>
         <Parameter Name="INDEX" Value="0"/>
       </SubApp>
-      <DataConnections>
-        <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="SERVER_1.QI" Source="E_SR.Q" dx1="220.0"/>
-        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="155.0"/>
-        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="80.0"/>
-        <Connection Comment="" Destination="ServiceAvailable.check" Source="F_EQ_1.OUT" dx1="420.0"/>
-        <Connection Comment="" Destination="E_SWITCH.G" Source="E_SR_1.Q" dx1="250.0"/>
-        <Connection Comment="" Destination="STRING2STRING.IN" Source="SERVER_1.RD_1" dx1="110.0"/>
-        <Connection Comment="" Destination="SERVER_1.SD_1" Source="STRING2STRING.OUT" dx1="60.0" dx2="60.0" dy="-130.0"/>
-        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint" dx1="1615.0"/>
-        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint" dx1="1640.0"/>
-      </DataConnections>
       <EventConnections>
-        <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneUnregister" dx1="425.0" dx2="200.0" dy="-4220.0"/>
-        <Connection Comment="" Destination="SERVER_1.INIT" Source="E_SR.EO" dx1="220.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneRegister" dx1="60.0" dx2="60.0" dy="-3770.0"/>
-        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="1045.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="NoServiceAvailable.CNF" dx1="60.0" dx2="60.0" dy="6100.0"/>
-        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="650.0"/>
-        <Connection Comment="" Destination="ServiceAvailable.REQ" Source="F_EQ_1.CNF" dx1="420.0"/>
-        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="495.0"/>
-        <Connection Comment="" Destination="F_EQ.REQ" Source="E_SWITCH.EO0" dx1="705.0"/>
-        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer_1.E2" dx1="3750.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="E_SR_1.EO" dx1="165.0" dx2="60.0" dy="1405.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="SERVER_1.INITO" dx1="60.0" dx2="520.0" dy="2120.0"/>
-        <Connection Comment="" Destination="CLIENT_1_2.REQ" Source="CLIENT_1_2.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
-        <Connection Comment="" Destination="CLIENT_1_2_1.INIT" Source="CLIENT_1_2.CNF" dx1="1120.0"/>
-        <Connection Comment="" Destination="CLIENT_1_2_1.REQ" Source="CLIENT_1_2_1.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
-        <Connection Comment="" Destination="CLIENT_1_2.INIT" Source="Sequencer_1.E0" dx1="2030.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="CLIENT_1_2_1.CNF" dx1="60.0" dx2="60.0" dy="1910.0"/>
-        <Connection Comment="" Destination="STRING2STRING.REQ" Source="SERVER_1.IND" dx1="110.0"/>
-        <Connection Comment="" Destination="SERVER_1.RSP" Source="STRING2STRING.CNF" dx1="60.0" dx2="60.0" dy="-935.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="ServiceAvailable.CNF" dx1="60.0" dx2="60.0" dy="7160.0"/>
-        <Connection Comment="" Destination="E_SR_1.S" Source="Sequencer_1.E3" dx1="7860.0"/>
-        <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E5" dx1="6810.0"/>
-        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer_1.E7" dx1="5290.0"/>
-        <Connection Comment="" Destination="E_SR_1.R" Source="Sequencer_1.E8" dx1="7860.0"/>
-        <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E10" dx1="7510.0"/>
-        <Connection Comment="" Destination="PUBL_0.INIT" Source="Sequencer_1.E12" dx1="1760.0"/>
-        <Connection Comment="" Destination="Sequencer_1.Next" Source="Service1.CNF" dx1="60.0" dx2="60.0" dy="1195.0"/>
-        <Connection Comment="" Destination="PUBL_0.REQ" Source="PUBL_0.INITO" dx1="60.0" dx2="60.0" dy="35.0"/>
-        <Connection Comment="" Destination="PUBL_0_1.INIT" Source="SUBL_0.INITO" dx1="380.0"/>
-        <Connection Comment="" Destination="PUBL_0_1.REQ" Source="PUBL_0_1.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
-        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromOrchestrationHTTPPFull.CNF" dx1="4015.0"/>
-        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E11" dx1="5550.0"/>
-        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E9" dx1="5580.0"/>
-        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E6" dx1="4760.0"/>
-        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E4" dx1="5075.0"/>
-        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E1" dx1="3390.0"/>
+        <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneUnregister" dx1="420.0" dx2="200.0" dy="-4215.0"/>
+        <Connection Comment="" Destination="SERVER_1.INIT" Source="E_SR.EO" dx1="215.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneRegister" dx1="55.0" dx2="55.0" dy="-3765.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="1040.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="NoServiceAvailable.CNF" dx1="55.0" dx2="55.0" dy="6100.0"/>
+        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="55.0" dx2="55.0" dy="645.0"/>
+        <Connection Comment="" Destination="ServiceAvailable.REQ" Source="F_EQ_1.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="490.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="E_SWITCH.EO0" dx1="700.0"/>
+        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer_1.E2" dx1="3745.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="E_SR_1.EO" dx1="160.0" dx2="55.0" dy="1400.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="SERVER_1.INITO" dx1="55.0" dx2="515.0" dy="2115.0"/>
+        <Connection Comment="" Destination="CLIENT_1_2.REQ" Source="CLIENT_1_2.INITO" dx1="55.0" dx2="55.0" dy="45.0"/>
+        <Connection Comment="" Destination="CLIENT_1_2_1.INIT" Source="CLIENT_1_2.CNF" dx1="1115.0"/>
+        <Connection Comment="" Destination="CLIENT_1_2_1.REQ" Source="CLIENT_1_2_1.INITO" dx1="55.0" dx2="55.0" dy="45.0"/>
+        <Connection Comment="" Destination="CLIENT_1_2.INIT" Source="Sequencer_1.E0" dx1="2025.0"/>
+        <Connection Comment="" Destination="STRING2STRING.REQ" Source="SERVER_1.IND" dx1="105.0"/>
+        <Connection Comment="" Destination="SERVER_1.RSP" Source="STRING2STRING.CNF" dx1="55.0" dx2="55.0" dy="-930.0"/>
+        <Connection Comment="" Destination="E_SR_1.S" Source="Sequencer_1.E3" dx1="7855.0"/>
+        <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E5" dx1="6805.0"/>
+        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer_1.E7" dx1="5285.0"/>
+        <Connection Comment="" Destination="E_SR_1.R" Source="Sequencer_1.E8" dx1="7855.0"/>
+        <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E10" dx1="7505.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="Service1.CNF" dx1="55.0" dx2="55.0" dy="1190.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E11" dx1="5545.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E9" dx1="5575.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E6" dx1="4755.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E4" dx1="5070.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E1" dx1="3385.0"/>
+        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromOrchestrationHTTPPFull.CNF" dx1="3400.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="CLIENT_1_2_1.CNF" dx1="55.0" dx2="55.0" dy="1905.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="ServiceAvailable.CNF" dx1="60.0" dx2="60.0" dy="7900.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="60.0" dx2="60.0" dy="3410.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1.E12" dx1="1755.0"/>
       </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT"/>
+        <Connection Comment="" Destination="SERVER_1.QI" Source="E_SR.Q" dx1="215.0"/>
+        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="150.0"/>
+        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="75.0"/>
+        <Connection Comment="" Destination="ServiceAvailable.check" Source="F_EQ_1.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="E_SWITCH.G" Source="E_SR_1.Q" dx1="245.0"/>
+        <Connection Comment="" Destination="STRING2STRING.IN" Source="SERVER_1.RD_1" dx1="105.0"/>
+        <Connection Comment="" Destination="SERVER_1.SD_1" Source="STRING2STRING.OUT" dx1="55.0" dx2="55.0" dy="-125.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint" dx1="1610.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint" dx1="1635.0"/>
+      </DataConnections>
     </SubAppNetwork>
   </Application>
-  <Device Comment="" Name="HTTPTest" Type="FORTE_PC" x="2615.0" y="455.0">
-    <Parameter Name="MGR_ID" Value="%testAddress%%addressSeparator%%testPort%"/>
+  <Application Comment="" Name="OpcUaTest1RegisterUnregister">
+    <SubAppNetwork>
+      <FB Comment="" Name="QueryService" Type="QueryService" x="7650.0" y="-175.0">
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </FB>
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="9620.0" y="45.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="15925.0" y="2010.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="ServiceNotRegisteredPos1" Type="TEST_CONDITION" x="17290.0" y="2070.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="11355.0" y="-25.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="2410.0" y="-1155.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToServiceQueryForm" Type="FieldsToServiceQueryForm" x="5285.0" y="-1175.0">
+        <Parameter Name="version" Value="%serviceVersion%"/>
+      </FB>
+      <FB Comment="" Name="Registered" Type="E_SR" x="13275.0" y="2155.0"/>
+      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="14230.0" y="2080.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="15925.0" y="2725.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="ServiceRegisteredPos0" Type="TEST_CONDITION" x="17290.0" y="2640.0"/>
+      <SubApp Comment="" Name="Sequencer" x="750.0" y="4125.0">
+        <SubAppInterfaceList>
+          <SubAppEventInputs>
+            <SubAppEvent Comment="" Name="Next" Type="Event"/>
+          </SubAppEventInputs>
+          <SubAppEventOutputs>
+            <SubAppEvent Comment="" Name="E0" Type="Event"/>
+            <SubAppEvent Comment="" Name="E1" Type="Event"/>
+            <SubAppEvent Comment="" Name="E2" Type="Event"/>
+            <SubAppEvent Comment="" Name="E3" Type="Event"/>
+            <SubAppEvent Comment="" Name="E4" Type="Event"/>
+            <SubAppEvent Comment="" Name="E5" Type="Event"/>
+            <SubAppEvent Comment="" Name="E6" Type="Event"/>
+            <SubAppEvent Comment="" Name="E7" Type="Event"/>
+          </SubAppEventOutputs>
+        </SubAppInterfaceList>
+        <SubAppNetwork>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
+          <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="4175.0" y="2660.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
+            <Parameter Name="IN2" Value="INT#3"/>
+          </FB>
+          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="5000.0" y="1325.0"/>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="2450.0" y="2350.0">
+            <Parameter Name="IN2" Value="INT#4"/>
+          </FB>
+          <EventConnections>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="410.0" dx2="55.0" dy="-1425.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="570.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1.EO3" dx1="300.0" dx2="55.0" dy="615.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="200.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="200.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="200.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="165.0"/>
+          </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+          </DataConnections>
+        </SubAppNetwork>
+      </SubApp>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="2850.0" y="765.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="5615.0" y="740.0">
+        <Parameter Name="serviceURI" Value="%serviceURI%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+      </FB>
+      <FB Comment="" Name="RegisterService" Type="RegisterService" x="8700.0" y="2805.0">
+        <Parameter Name="endpoint" Value="%serviceRegistryAddress%"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="11350.0" y="940.0"/>
+      <FB Comment="" Name="ServiceNotRegisteredPos0" Type="TEST_CONDITION" x="17140.0" y="1305.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="9555.0" y="930.0">
+        <Parameter Name="INDEX" Value="1"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="15900.0" y="1300.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="PUBLISH_0" Type="PUBL_0" x="14125.0" y="4165.0">
+        <Parameter Name="ID" Value="%firstResourceReady%"/>
+      </FB>
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="1135.0" y="-1275.0">
+        <Parameter Name="ID" Value="%cleanFinished%"/>
+      </FB>
+      <FB Comment="" Name="RegisterServiceOpcUa" Type="RegisterServiceOpcUa" x="10700.0" y="3300.0"/>
+      <FB Comment="" Name="QueryServiceOpcUa" Type="QueryServiceOpcUa" x="9545.0" y="1620.0"/>
+      <EventConnections>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService.queried" dx1="375.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="635.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="780.0"/>
+        <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="260.0"/>
+        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="1120.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="505.0"/>
+        <Connection Comment="" Destination="ServiceRegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="485.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceRegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="750.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneUnregister" dx1="245.0" dx2="55.0" dy="-975.0"/>
+        <Connection Comment="" Destination="Registered.R" Source="RegisterService.doneUnregister" dx1="1860.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneRegister" dx1="55.0" dx2="55.0" dy="-805.0"/>
+        <Connection Comment="" Destination="Registered.S" Source="RegisterService.doneRegister" dx1="1715.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="945.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="435.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="600.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="345.0"/>
+        <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO0" dx1="285.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="2300.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceNotRegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="-3215.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToServiceQueryForm.CNF" dx1="55.0" dx2="55.0" dy="980.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToServiceRegistryEntry.CNF" dx1="200.0" dx2="55.0" dy="2635.0"/>
+        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E4" dx1="1205.0"/>
+        <Connection Comment="" Destination="RegisterService.unregister" Source="Sequencer.E3" dx1="855.0"/>
+        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E2" dx1="535.0"/>
+        <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E1" dx1="355.0"/>
+        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E0" dx1="155.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="SUBL_0.IND" dx1="415.0"/>
+        <Connection Comment="" Destination="PUBLISH_0.INIT" Source="SUBL_0.INITO" dx1="6245.0"/>
+        <Connection Comment="" Destination="PUBLISH_0.REQ" Source="Sequencer.E5" dx1="6485.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="265.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="635.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="465.0"/>
+        <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="260.0"/>
+        <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="255.0"/>
+        <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="485.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2145.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="645.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="520.0"/>
+        <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="660.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="485.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="345.0"/>
+        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2665.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="1570.0"/>
+      </DataConnections>
+      <AdapterConnections>
+        <Connection Comment="" Destination="RegisterServiceOpcUa.registerService" Source="RegisterService.registerService" dx1="135.0"/>
+        <Connection Comment="" Destination="QueryServiceOpcUa.queryServices" Source="QueryService.queryServices" dx1="175.0"/>
+      </AdapterConnections>
+    </SubAppNetwork>
+  </Application>
+  <Application Comment="" Name="OpcUaTest2DoubleRegister">
+    <SubAppNetwork>
+      <FB Comment="" Name="QueryService" Type="QueryService" x="8845.0" y="1035.0">
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </FB>
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="10790.0" y="165.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="17120.0" y="2450.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="ServiceNotRegisteredPos1" Type="TEST_CONDITION" x="18485.0" y="2510.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="12545.0" y="180.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="3920.0" y="-1505.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToServiceQueryForm" Type="FieldsToServiceQueryForm" x="6790.0" y="-1400.0">
+        <Parameter Name="version" Value="%serviceVersion%"/>
+      </FB>
+      <FB Comment="" Name="Registered" Type="E_SR" x="14470.0" y="2600.0"/>
+      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="15425.0" y="2520.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="17120.0" y="3165.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="ServiceRegisteredPos0" Type="TEST_CONDITION" x="18485.0" y="3080.0"/>
+      <SubApp Comment="" Name="Sequencer" x="1945.0" y="4565.0">
+        <SubAppInterfaceList>
+          <SubAppEventInputs>
+            <SubAppEvent Comment="" Name="Next" Type="Event"/>
+          </SubAppEventInputs>
+          <SubAppEventOutputs>
+            <SubAppEvent Comment="" Name="E0" Type="Event"/>
+            <SubAppEvent Comment="" Name="E1" Type="Event"/>
+            <SubAppEvent Comment="" Name="E2" Type="Event"/>
+            <SubAppEvent Comment="" Name="E3" Type="Event"/>
+            <SubAppEvent Comment="" Name="E4" Type="Event"/>
+            <SubAppEvent Comment="" Name="E5" Type="Event"/>
+            <SubAppEvent Comment="" Name="E6" Type="Event"/>
+            <SubAppEvent Comment="" Name="E7" Type="Event"/>
+          </SubAppEventOutputs>
+        </SubAppInterfaceList>
+        <SubAppNetwork>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
+          <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="4175.0" y="2660.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
+            <Parameter Name="IN2" Value="INT#3"/>
+          </FB>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="2450.0" y="2350.0">
+            <Parameter Name="IN2" Value="INT#4"/>
+          </FB>
+          <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="4955.0" y="825.0"/>
+          <EventConnections>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="720.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="720.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="570.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1.EO3" dx1="300.0" dx2="55.0" dy="615.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI2" Source="E_DEMUX_1.EO1" dx1="125.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI2" Source="E_DEMUX_1.EO2" dx1="125.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE_1.EO" dx1="55.0" dx2="55.0" dy="-785.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI1" Source="E_DEMUX.EO2" dx1="200.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI1" Source="E_DEMUX.EO1" dx1="200.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI1" Source="E_DEMUX.EO0" dx1="200.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI2" Source="E_DEMUX_1.EO0" dx1="125.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
+            <Connection Comment="" Destination="E_MERGE_1.EI1" Source="E_DEMUX.EO3" dx1="200.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="720.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="720.0"/>
+          </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+          </DataConnections>
+        </SubAppNetwork>
+      </SubApp>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="4005.0" y="-220.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="6670.0" y="-200.0">
+        <Parameter Name="serviceURI" Value="%serviceURI%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+      </FB>
+      <FB Comment="" Name="RegisterService" Type="RegisterService" x="9890.0" y="3245.0">
+        <Parameter Name="endpoint" Value="%serviceRegistryAddress%"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="12525.0" y="1000.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="10770.0" y="985.0">
+        <Parameter Name="INDEX" Value="1"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="17110.0" y="1770.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="ServiceNotRegisteredPos0" Type="TEST_CONDITION" x="18475.0" y="1830.0"/>
+      <FB Comment="" Name="SUBSCRIBE_0" Type="SUBL_0" x="-845.0" y="-1670.0">
+        <Parameter Name="ID" Value="%firstResourceReady%"/>
+      </FB>
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="5590.0" y="5655.0">
+        <Parameter Name="ID" Value="%secondResourceReady%"/>
+      </FB>
+      <FB Comment="" Name="RegisterServiceOpcUa" Type="RegisterServiceOpcUa" x="11680.0" y="3710.0"/>
+      <FB Comment="" Name="QueryServiceOpcUa" Type="QueryServiceOpcUa" x="10740.0" y="2060.0"/>
+      <EventConnections>
+        <Connection Comment="" Destination="ServiceRegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="485.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="505.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="635.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService.queried" dx1="375.0"/>
+        <Connection Comment="" Destination="Registered.R" Source="RegisterService.doneUnregister" dx1="1860.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="550.0"/>
+        <Connection Comment="" Destination="Registered.S" Source="RegisterService.doneRegister" dx1="1715.0"/>
+        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="1130.0"/>
+        <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="260.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceRegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="750.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="945.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="360.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="550.0"/>
+        <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO0" dx1="285.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="485.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="2760.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="ServiceNotRegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="-3755.0"/>
+        <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E0" dx1="600.0"/>
+        <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E1" dx1="825.0"/>
+        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E2" dx1="1015.0"/>
+        <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E4" dx1="1645.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToServiceRegistryEntry.CNF" dx1="55.0" dx2="55.0" dy="2380.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="SUBSCRIBE_0.IND" dx1="445.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToServiceQueryForm.CNF" dx1="55.0" dx2="55.0" dy="585.0"/>
+        <Connection Comment="" Destination="RegisterService.unregister" Source="Sequencer.E3" dx1="1145.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneRegister" dx1="55.0" dx2="55.0" dy="-805.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneUnregister" dx1="245.0" dx2="55.0" dy="-975.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E5" dx1="1640.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBSCRIBE_0.INITO" dx1="1300.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="485.0"/>
+        <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="660.0"/>
+        <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="465.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2145.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="520.0"/>
+        <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="255.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="645.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="420.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="635.0"/>
+        <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="260.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="360.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2665.0"/>
+        <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="485.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2465.0"/>
+      </DataConnections>
+      <AdapterConnections>
+        <Connection Comment="" Destination="RegisterServiceOpcUa.registerService" Source="RegisterService.registerService" dx1="60.0" dx2="60.0" dy="130.0"/>
+        <Connection Comment="" Destination="QueryServiceOpcUa.queryServices" Source="QueryService.queryServices" dx1="175.0"/>
+      </AdapterConnections>
+    </SubAppNetwork>
+  </Application>
+  <Application Comment="" Name="OpcUaTest3RegisterMoreServices">
+    <SubAppNetwork>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="10105.0" y="6545.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="8370.0" y="6525.0">
+        <Parameter Name="INDEX" Value="1"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="10110.0" y="5570.0"/>
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="16950.0" y="6315.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="-185.0" y="340.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="16920.0" y="4985.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="8375.0" y="5650.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="S1Reg" Type="E_SR" x="11590.0" y="1235.0"/>
+      <FB Comment="" Name="Service2RegisteredPos0" Type="TEST_CONDITION" x="18270.0" y="8815.0"/>
+      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="13710.0" y="4375.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="16675.0" y="8665.0">
+        <Parameter Name="IN1" Value="%validEndpoint2%"/>
+      </FB>
+      <FB Comment="" Name="Service1RegisteredPos0" Type="TEST_CONDITION" x="18170.0" y="5000.0"/>
+      <FB Comment="" Name="Service1NotRegisteredPos1" Type="TEST_CONDITION" x="18175.0" y="6320.0"/>
+      <SubApp Comment="" Name="Sequencer" x="2125.0" y="4020.0">
+        <SubAppInterfaceList>
+          <SubAppEventInputs>
+            <SubAppEvent Comment="" Name="Next" Type="Event"/>
+          </SubAppEventInputs>
+          <SubAppEventOutputs>
+            <SubAppEvent Comment="" Name="E0" Type="Event"/>
+            <SubAppEvent Comment="" Name="E1" Type="Event"/>
+            <SubAppEvent Comment="" Name="E2" Type="Event"/>
+            <SubAppEvent Comment="" Name="E3" Type="Event"/>
+            <SubAppEvent Comment="" Name="E4" Type="Event"/>
+            <SubAppEvent Comment="" Name="E5" Type="Event"/>
+            <SubAppEvent Comment="" Name="E6" Type="Event"/>
+            <SubAppEvent Comment="" Name="E7" Type="Event"/>
+            <SubAppEvent Comment="" Name="E8" Type="Event"/>
+            <SubAppEvent Comment="" Name="E9" Type="Event"/>
+            <SubAppEvent Comment="" Name="E10" Type="Event"/>
+            <SubAppEvent Comment="" Name="E11" Type="Event"/>
+          </SubAppEventOutputs>
+        </SubAppInterfaceList>
+        <SubAppNetwork>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
+          <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
+            <Parameter Name="IN2" Value="INT#3"/>
+          </FB>
+          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="8250.0" y="2575.0"/>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
+            <Parameter Name="IN2" Value="INT#4"/>
+          </FB>
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
+            <Parameter Name="IN2" Value="INT#7"/>
+          </FB>
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
+            <Parameter Name="IN2" Value="INT#8"/>
+          </FB>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
+          <EventConnections>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="220.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="410.0" dx2="55.0" dy="-1425.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="165.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="445.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1200.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1200.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1200.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1200.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO3" dx1="110.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO0" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO1" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO2" dx1="875.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
+          </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+          </DataConnections>
+        </SubAppNetwork>
+      </SubApp>
+      <FB Comment="" Name="Service2NotRegisteredPos1" Type="TEST_CONDITION" x="18265.0" y="9610.0"/>
+      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="17015.0" y="9600.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="S2Reg" Type="E_SR" x="11560.0" y="2845.0"/>
+      <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="13565.0" y="8175.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="8360.0" y="8490.0">
+        <Parameter Name="INDEX" Value="1"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="10100.0" y="8510.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_2" Type="GetEndpointFromServiceRegistryEntry" x="10100.0" y="7535.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_2" Type="GET_AT_INDEX" x="8365.0" y="7615.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="-2060.0" y="355.0">
+        <Parameter Name="ID" Value="%secondResourceReady%"/>
+      </FB>
+      <FB Comment="" Name="Service1NotRegisteredPos0" Type="TEST_CONDITION" x="18085.0" y="4375.0"/>
+      <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="16860.0" y="4355.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="16700.0" y="7875.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="Service2NotRegisteredPos0" Type="TEST_CONDITION" x="17925.0" y="7900.0"/>
+      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="-180.0" y="1490.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="Service2" Type="FieldsToArrowheadService" x="-175.0" y="2280.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="9020.0" y="12780.0">
+        <Parameter Name="ID" Value="%testMoreServicesReady%"/>
+      </FB>
+      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialOpcUa" x="7640.0" y="2930.0">
+        <Parameter Name="serviceURI" Value="%serviceURI2%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialOpcUa" x="7600.0" y="1270.0">
+        <Parameter Name="serviceURI" Value="%serviceURI%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryService2" Type="QueryServiceOpcUaSub" x="4010.0" y="7690.0">
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryService1" Type="QueryServiceOpcUaSub" x="4020.0" y="5725.0">
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <EventConnections>
+        <Connection Comment="" Destination="Service1NotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="Service1RegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="440.0"/>
+        <Connection Comment="" Destination="Service2RegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos1.REQ" Source="F_EQ_1_1.CNF" dx1="440.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="655.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="55.0" dx2="55.0" dy="430.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="570.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="55.0" dx2="55.0" dy="480.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="Service1RegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="455.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Service2RegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="505.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="GET_AT_INDEX_2.CNF" dx1="55.0" dx2="55.0" dy="435.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="780.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_2.CNF" dx1="55.0" dx2="55.0" dy="165.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos0.REQ" Source="F_EQ_3.CNF" dx1="415.0"/>
+        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="1080.0"/>
+        <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO1" dx1="1375.0"/>
+        <Connection Comment="" Destination="F_EQ_3.REQ" Source="E_SWITCH.EO0" dx1="1345.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="Service1NotRegisteredPos0.CNF" dx1="275.0" dx2="55.0" dy="1500.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos0.REQ" Source="F_EQ_3_1.CNF" dx1="415.0"/>
+        <Connection Comment="" Destination="E_SWITCH_1.EI" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="990.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH_1.EO1" dx1="1500.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="E_SWITCH_1.EO0" dx1="1335.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Service2NotRegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="845.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="Service2NotRegisteredPos1.CNF" dx1="55.0" dx2="55.0" dy="1775.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="Service1NotRegisteredPos1.CNF" dx1="55.0" dx2="55.0" dy="5555.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="S2Reg.EO" dx1="10275.0" dx2="1075.0" dy="12455.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="S1Reg.EO" dx1="13055.0" dx2="515.0" dy="13515.0"/>
+        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="55.0" dx2="55.0" dy="570.0"/>
+        <Connection Comment="" Destination="Service2.REQ" Source="Service1.CNF" dx1="55.0" dx2="55.0" dy="390.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="Service2.CNF" dx1="525.0"/>
+        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer.E1" dx1="2775.0"/>
+        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer.E7" dx1="2560.0"/>
+        <Connection Comment="" Destination="S2Reg.S" Source="RegisterService2.doneRegister" dx1="2530.0"/>
+        <Connection Comment="" Destination="S2Reg.R" Source="RegisterService2.doneUnregister" dx1="2530.0"/>
+        <Connection Comment="" Destination="RegisterService1.register" Source="Sequencer.E0" dx1="2025.0"/>
+        <Connection Comment="" Destination="RegisterService1.unregister" Source="Sequencer.E4" dx1="2555.0"/>
+        <Connection Comment="" Destination="S1Reg.S" Source="RegisterService1.doneRegister" dx1="815.0"/>
+        <Connection Comment="" Destination="S1Reg.R" Source="RegisterService1.doneUnregister" dx1="885.0"/>
+        <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E3" dx1="765.0"/>
+        <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E6" dx1="765.0"/>
+        <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E9" dx1="745.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_2.REQ" Source="QueryService2.CNF" dx1="1660.0"/>
+        <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E2" dx1="965.0"/>
+        <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E5" dx1="770.0"/>
+        <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E8" dx1="750.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService1.CNF" dx1="1660.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E10" dx1="3305.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="5290.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ_2.OUT" dx1="445.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="E_SWITCH.G" Source="S1Reg.Q" dx1="1375.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_1_1.OUT" dx1="440.0"/>
+        <Connection Comment="" Destination="E_SWITCH_1.G" Source="S2Reg.Q" dx1="250.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.serviceRegistryEntry" Source="GET_AT_INDEX_2.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2705.0"/>
+        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3115.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="3215.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="2675.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos0.check" Source="F_EQ_3.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3045.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos0.check" Source="F_EQ_3_1.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="3385.0"/>
+        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service2.arrowheadService" dx1="3285.0"/>
+        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1020.0"/>
+        <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService" dx1="3265.0"/>
+        <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1225.0"/>
+        <Connection Comment="" Destination="QueryService2.service" Source="Service2.arrowheadService" dx1="765.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_2.IN_ARRAY" Source="QueryService2.serviceEntries" dx1="2325.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryService2.serviceEntries" dx1="2325.0"/>
+        <Connection Comment="" Destination="QueryService1.service" Source="Service1.arrowheadService" dx1="945.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService1.serviceEntries" dx1="2325.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService1.serviceEntries" dx1="2325.0"/>
+      </DataConnections>
+    </SubAppNetwork>
+  </Application>
+  <Application Comment="" Name="OpcUaTest0CleanALL">
+    <SubAppNetwork>
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="6215.0" y="3600.0">
+        <Parameter Name="ID" Value="%cleanFinished%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="480.0" y="130.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="460.0" y="1080.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadService_1" Type="FieldsToArrowheadService" x="465.0" y="1870.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadSystem_1" Type="FieldsToArrowheadSystem" x="505.0" y="2685.0">
+        <Parameter Name="systemName" Value="%systemName2%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="8115.0" y="3630.0">
+        <Parameter Name="ID" Value="%allEnded%"/>
+      </FB>
+      <FB Comment="" Name="STEST_END" Type="STEST_END" x="9915.0" y="3765.0"/>
+      <FB Comment="" Name="SUBL_0_1" Type="SUBL_0" x="-835.0" y="-20.0">
+        <Parameter Name="ID" Value="%allLoaded%"/>
+      </FB>
+      <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialOpcUa" x="3525.0" y="565.0">
+        <Parameter Name="serviceURI" Value="%serviceURI%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="RegisterService2_1" Type="RegisterServicePartialOpcUa" x="3400.0" y="3680.0">
+        <Parameter Name="serviceURI" Value="%serviceURI2%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialOpcUa" x="3415.0" y="2225.0">
+        <Parameter Name="serviceURI" Value="%serviceURI2%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <EventConnections>
+        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="55.0" dx2="55.0" dy="340.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1.REQ" Source="FieldsToArrowheadService.CNF" dx1="55.0" dx2="55.0" dy="390.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem_1.REQ" Source="FieldsToArrowheadService_1.CNF" dx1="55.0" dx2="55.0" dy="400.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="SUBL_0.INITO" dx1="55.0" dx2="55.0" dy="-405.0"/>
+        <Connection Comment="" Destination="SUBL_0.INIT" Source="PUBL_0.INITO" dx1="590.0"/>
+        <Connection Comment="" Destination="STEST_END.REQ" Source="SUBL_0.IND" dx1="680.0"/>
+        <Connection Comment="" Destination="RegisterService1.unregister" Source="FieldsToArrowheadSystem_1.CNF" dx1="900.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="RegisterService2_1.doneUnregister" dx1="910.0"/>
+        <Connection Comment="" Destination="RegisterService2.unregister" Source="RegisterService1.doneUnregister" dx1="55.0" dx2="55.0" dy="875.0"/>
+        <Connection Comment="" Destination="RegisterService2_1.unregister" Source="RegisterService2.doneUnregister" dx1="55.0" dx2="55.0" dy="630.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0_1.IND" dx1="85.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="RegisterService1.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="905.0"/>
+        <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="610.0"/>
+        <Connection Comment="" Destination="RegisterService2_1.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="840.0"/>
+        <Connection Comment="" Destination="RegisterService2_1.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem" dx1="800.0"/>
+        <Connection Comment="" Destination="RegisterService2.providedService" Source="FieldsToArrowheadService_1.arrowheadService" dx1="845.0"/>
+        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="635.0"/>
+      </DataConnections>
+    </SubAppNetwork>
+  </Application>
+  <Application Comment="" Name="OpcUaTest4SameServiceTwice">
+    <SubAppNetwork>
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="590.0" y="240.0">
+        <Parameter Name="ID" Value="%testMoreServicesReady%"/>
+      </FB>
+      <SubApp Comment="" Name="Sequencer" x="4565.0" y="3700.0">
+        <SubAppInterfaceList>
+          <SubAppEventInputs>
+            <SubAppEvent Comment="" Name="Next" Type="Event"/>
+          </SubAppEventInputs>
+          <SubAppEventOutputs>
+            <SubAppEvent Comment="" Name="E0" Type="Event"/>
+            <SubAppEvent Comment="" Name="E1" Type="Event"/>
+            <SubAppEvent Comment="" Name="E2" Type="Event"/>
+            <SubAppEvent Comment="" Name="E3" Type="Event"/>
+            <SubAppEvent Comment="" Name="E4" Type="Event"/>
+            <SubAppEvent Comment="" Name="E5" Type="Event"/>
+            <SubAppEvent Comment="" Name="E6" Type="Event"/>
+            <SubAppEvent Comment="" Name="E7" Type="Event"/>
+            <SubAppEvent Comment="" Name="E8" Type="Event"/>
+            <SubAppEvent Comment="" Name="E9" Type="Event"/>
+            <SubAppEvent Comment="" Name="E10" Type="Event"/>
+            <SubAppEvent Comment="" Name="E11" Type="Event"/>
+          </SubAppEventOutputs>
+        </SubAppInterfaceList>
+        <SubAppNetwork>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
+          <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
+            <Parameter Name="IN2" Value="INT#3"/>
+          </FB>
+          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="8250.0" y="2575.0"/>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
+            <Parameter Name="IN2" Value="INT#4"/>
+          </FB>
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
+            <Parameter Name="IN2" Value="INT#7"/>
+          </FB>
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
+            <Parameter Name="IN2" Value="INT#8"/>
+          </FB>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
+          <EventConnections>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="220.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="410.0" dx2="55.0" dy="-1425.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="165.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="445.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1200.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1200.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1200.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1200.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO3" dx1="110.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO0" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO1" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO2" dx1="875.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
+          </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+          </DataConnections>
+        </SubAppNetwork>
+      </SubApp>
+      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="4580.0" y="2425.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="4575.0" y="1275.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="9330.0" y="6665.0">
+        <Parameter Name="INDEX" Value="1"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="11070.0" y="5710.0"/>
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="9335.0" y="5790.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="11065.0" y="6685.0"/>
+      <FB Comment="" Name="Service1RegisteredPos0" Type="TEST_CONDITION" x="23345.0" y="4935.0"/>
+      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="21280.0" y="3320.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="BothServicesRegistered" Type="TEST_CONDITION" x="24410.0" y="2120.0"/>
+      <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="21305.0" y="2675.0">
+        <Parameter Name="IN1" Value="%validEndpoint2%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="22120.0" y="4930.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_2_1" Type="F_EQ" x="21260.0" y="1905.0">
+        <Parameter Name="IN1" Value="%validEndpoint2%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="21280.0" y="1255.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="Service2RegisteredPos0" Type="TEST_CONDITION" x="23315.0" y="6525.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="22030.0" y="6450.0">
+        <Parameter Name="IN1" Value="%validEndpoint2%"/>
+      </FB>
+      <FB Comment="" Name="BothServicesNotRegistered" Type="TEST_CONDITION" x="24265.0" y="8240.0"/>
+      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="22040.0" y="8160.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_1_1_1" Type="F_EQ" x="22040.0" y="8850.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="Service2NotRegisteredPos1" Type="TEST_CONDITION" x="23345.0" y="5600.0"/>
+      <FB Comment="" Name="F_EQ_4" Type="F_EQ" x="22120.0" y="5590.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_4_1" Type="F_EQ" x="22055.0" y="7185.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="Service1NotRegisteredPos1" Type="TEST_CONDITION" x="23280.0" y="7190.0"/>
+      <FB Comment="" Name="F_AND" Type="F_AND" x="23140.0" y="8320.0"/>
+      <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="25835.0" y="6100.0"/>
+      <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="15070.0" y="2825.0"/>
+      <FB Comment="" Name="F_AND_1" Type="F_AND" x="22205.0" y="1545.0"/>
+      <FB Comment="" Name="F_OR" Type="F_OR" x="23910.0" y="2220.0"/>
+      <FB Comment="" Name="F_AND_1_1" Type="F_AND" x="22205.0" y="2900.0"/>
+      <FB Comment="" Name="BOOL2BOOL" Type="BOOL2BOOL" x="23060.0" y="1740.0"/>
+      <FB Comment="" Name="BOOL2BOOL_1" Type="BOOL2BOOL" x="23000.0" y="2665.0"/>
+      <FB Comment="" Name="FieldsToArrowheadSystem_1" Type="FieldsToArrowheadSystem" x="4575.0" y="230.0">
+        <Parameter Name="systemName" Value="%systemName2%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="5850.0" y="7810.0">
+        <Parameter Name="ID" Value="%sameServiceTwiceReady%"/>
+      </FB>
+      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialOpcUa" x="12410.0" y="3865.0">
+        <Parameter Name="serviceURI" Value="%serviceURI2%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialOpcUa" x="12365.0" y="2205.0">
+        <Parameter Name="serviceURI" Value="%serviceURI%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryServiceHTTPSub" Type="QueryServiceOpcUaSub" x="7055.0" y="5565.0">
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <EventConnections>
+        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="55.0" dx2="55.0" dy="815.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="420.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="55.0" dx2="55.0" dy="480.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="55.0" dx2="55.0" dy="430.0"/>
+        <Connection Comment="" Destination="Service1RegisteredPos0.REQ" Source="F_EQ.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="Service2RegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="445.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1_1.REQ" Source="F_EQ_1_1.CNF" dx1="55.0" dx2="55.0" dy="340.0"/>
+        <Connection Comment="" Destination="F_AND.REQ" Source="F_EQ_1_1_1.CNF" dx1="235.0"/>
+        <Connection Comment="" Destination="BothServicesNotRegistered.REQ" Source="F_AND.CNF" dx1="365.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI2" Source="BothServicesNotRegistered.CNF" dx1="380.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI2" Source="Service1NotRegisteredPos1.CNF" dx1="925.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI2" Source="Service2NotRegisteredPos1.CNF" dx1="890.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI1" Source="BothServicesRegistered.CNF" dx1="365.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="55.0" dx2="55.0" dy="6635.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="3600.0" dx2="2000.0" dy="-3575.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="55.0" dx2="55.0" dy="2300.0"/>
+        <Connection Comment="" Destination="F_EQ_2_1.REQ" Source="F_EQ_3_1.CNF" dx1="55.0" dx2="55.0" dy="315.0"/>
+        <Connection Comment="" Destination="F_EQ_4.REQ" Source="Service1RegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="325.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos1.REQ" Source="F_EQ_4.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1.REQ" Source="Service2RegisteredPos0.CNF" dx1="55.0" dx2="55.0" dy="325.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos1.REQ" Source="F_EQ_4_1.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="F_AND_1.REQ" Source="F_EQ_2_1.CNF" dx1="275.0"/>
+        <Connection Comment="" Destination="BOOL2BOOL.REQ" Source="F_AND_1.CNF" dx1="225.0"/>
+        <Connection Comment="" Destination="F_EQ_3.REQ" Source="BOOL2BOOL.CNF" dx1="55.0" dx2="55.0" dy="460.0"/>
+        <Connection Comment="" Destination="F_EQ_2.REQ" Source="F_EQ_3.CNF" dx1="55.0" dx2="55.0" dy="315.0"/>
+        <Connection Comment="" Destination="F_AND_1_1.REQ" Source="F_EQ_2.CNF" dx1="265.0"/>
+        <Connection Comment="" Destination="BOOL2BOOL_1.REQ" Source="F_AND_1_1.CNF" dx1="200.0"/>
+        <Connection Comment="" Destination="F_OR.REQ" Source="BOOL2BOOL_1.CNF" dx1="80.0"/>
+        <Connection Comment="" Destination="BothServicesRegistered.REQ" Source="F_OR.CNF" dx1="65.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="Sequencer.E3" dx1="8160.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="Sequencer.E6" dx1="8860.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Sequencer.E9" dx1="8540.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="Service1.CNF" dx1="55.0" dx2="55.0" dy="630.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToArrowheadSystem_1.CNF" dx1="55.0" dx2="55.0" dy="515.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem_1.REQ" Source="SUBL_0.IND" dx1="215.0"/>
+        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer.E1" dx1="3725.0"/>
+        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer.E7" dx1="3725.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI1" Source="RegisterService2.doneRegister" dx1="830.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI2" Source="RegisterService2.doneUnregister" dx1="830.0"/>
+        <Connection Comment="" Destination="RegisterService1.register" Source="Sequencer.E0" dx1="3400.0"/>
+        <Connection Comment="" Destination="RegisterService1.unregister" Source="Sequencer.E4" dx1="3700.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI1" Source="RegisterService1.doneRegister" dx1="980.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI2" Source="RegisterService1.doneUnregister" dx1="720.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E2" dx1="1145.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E5" dx1="1045.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E8" dx1="1045.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryServiceHTTPSub.CNF" dx1="625.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="2380.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E10" dx1="805.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="445.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3905.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="3865.0"/>
+        <Connection Comment="" Destination="F_AND.IN1" Source="F_EQ_1_1.OUT" dx1="350.0"/>
+        <Connection Comment="" Destination="F_AND.IN2" Source="F_EQ_1_1_1.OUT" dx1="350.0"/>
+        <Connection Comment="" Destination="BothServicesNotRegistered.check" Source="F_AND.OUT" dx1="365.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4845.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4800.0"/>
+        <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4805.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4775.0"/>
+        <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_4.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ_4_1.OUT"/>
+        <Connection Comment="" Destination="F_AND_1_1.IN1" Source="F_EQ_3.OUT" dx1="250.0"/>
+        <Connection Comment="" Destination="F_AND_1_1.IN2" Source="F_EQ_2.OUT" dx1="265.0"/>
+        <Connection Comment="" Destination="F_AND_1.IN1" Source="F_EQ_3_1.OUT" dx1="265.0"/>
+        <Connection Comment="" Destination="F_AND_1.IN2" Source="F_EQ_2_1.OUT" dx1="275.0"/>
+        <Connection Comment="" Destination="BOOL2BOOL.IN" Source="F_AND_1.OUT" dx1="225.0"/>
+        <Connection Comment="" Destination="BOOL2BOOL_1.IN" Source="F_AND_1_1.OUT" dx1="200.0"/>
+        <Connection Comment="" Destination="F_OR.IN2" Source="BOOL2BOOL_1.OUT" dx1="80.0"/>
+        <Connection Comment="" Destination="F_OR.IN1" Source="BOOL2BOOL.OUT" dx1="155.0"/>
+        <Connection Comment="" Destination="BothServicesRegistered.check" Source="F_OR.OUT" dx1="65.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4425.0"/>
+        <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4435.0"/>
+        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4385.0"/>
+        <Connection Comment="" Destination="F_EQ_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4375.0"/>
+        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="3290.0"/>
+        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem" dx1="4010.0"/>
+        <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService" dx1="3265.0"/>
+        <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="4470.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="Service1.arrowheadService" dx1="610.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="625.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="625.0"/>
+      </DataConnections>
+    </SubAppNetwork>
+  </Application>
+  <Application Comment="" Name="OpcUaTest5VersionAndMetadata">
+    <SubAppNetwork>
+      <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="2930.0" y="2655.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="8225.0" y="2745.0"/>
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="7040.0" y="2705.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_4" Type="F_EQ" x="11035.0" y="2600.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="LowerVersion" Type="TEST_CONDITION" x="12260.0" y="2605.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService_1" Type="FieldsToArrowheadService" x="2905.0" y="3950.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="SameVersion" Type="TEST_CONDITION" x="12235.0" y="3900.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="7015.0" y="4000.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="8200.0" y="4040.0"/>
+      <FB Comment="" Name="F_EQ_4_1" Type="F_EQ" x="11010.0" y="3900.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="OneInterfaceOutOfTwo" Type="TEST_CONDITION" x="12205.0" y="5390.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8170.0" y="5530.0"/>
+      <FB Comment="" Name="F_EQ_4_1_1" Type="F_EQ" x="10980.0" y="5385.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadService_1_1" Type="FieldsToArrowheadService" x="2875.0" y="5440.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="6985.0" y="5490.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="OneInterfaceOutOfTwo_2" Type="TEST_CONDITION" x="12170.0" y="6800.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2" Type="GetEndpointFromServiceRegistryEntry" x="8135.0" y="6935.0"/>
+      <FB Comment="" Name="F_EQ_4_1_2" Type="F_EQ" x="10945.0" y="6790.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadService_1_2" Type="FieldsToArrowheadService" x="2840.0" y="6845.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="GET_AT_INDEX_1_2" Type="GET_AT_INDEX" x="6950.0" y="6900.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="WrongInterface" Type="TEST_CONDITION" x="12255.0" y="9950.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1_2_1" Type="GET_AT_INDEX" x="7035.0" y="10050.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1" Type="GetEndpointFromServiceRegistryEntry" x="8220.0" y="10090.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService_1_2_1" Type="FieldsToArrowheadService" x="2925.0" y="10000.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON1&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_4_1_2_1" Type="F_EQ" x="11030.0" y="9945.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="705.0" y="230.0">
+        <Parameter Name="ID" Value="%sameServiceTwiceReady%"/>
+      </FB>
+      <FB Comment="" Name="OnlyOneMetadata" Type="TEST_CONDITION" x="12200.0" y="11345.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8165.0" y="11485.0"/>
+      <FB Comment="" Name="F_EQ_4_1_2_1_1" Type="F_EQ" x="10975.0" y="11340.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1" Type="FieldsToArrowheadService" x="2870.0" y="11400.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="[&quot;key1=value1&quot;]"/>
+      </FB>
+      <FB Comment="" Name="GET_AT_INDEX_1_2_1_1" Type="GET_AT_INDEX" x="6980.0" y="11445.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8235.0" y="12880.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1_1" Type="FieldsToArrowheadService" x="2940.0" y="12790.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_4_1_2_1_1_1" Type="F_EQ" x="11045.0" y="12735.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="GET_AT_INDEX_1_2_1_1_1" Type="GET_AT_INDEX" x="7050.0" y="12840.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="NoMetadataAndAsked" Type="TEST_CONDITION" x="12270.0" y="12740.0"/>
+      <FB Comment="" Name="F_EQ_4_1_2_1_2" Type="F_EQ" x="10750.0" y="8350.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="GET_AT_INDEX_1_2_1_2" Type="GET_AT_INDEX" x="6755.0" y="8455.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_2" Type="FieldsToArrowheadService" x="2645.0" y="8405.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_2" Type="GetEndpointFromServiceRegistryEntry" x="7940.0" y="8500.0"/>
+      <FB Comment="" Name="NoInterface" Type="TEST_CONDITION" x="11975.0" y="8355.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8160.0" y="14440.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1_2_1_1_1_1" Type="GET_AT_INDEX" x="6975.0" y="14400.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_4_1_2_1_1_1_1" Type="F_EQ" x="10970.0" y="14300.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="WrongMetadaButNotAsked" Type="TEST_CONDITION" x="12200.0" y="14300.0"/>
+      <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1_1_1" Type="FieldsToArrowheadService" x="2865.0" y="14350.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+      </FB>
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="7000.0" y="0.0">
+        <Parameter Name="ID" Value="%versionEnded%"/>
+      </FB>
+      <SubApp Comment="" Name="RegisterServiceFullHTTP" Type="RegisterServiceFullOpcUa" x="5140.0" y="255.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        <Parameter Name="serviceURI" Value="%serviceURI%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryServiceHTTPSub" Type="QueryServiceOpcUaSub" x="5080.0" y="2905.0">
+        <Parameter Name="version" Value="0"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1" Type="QueryServiceOpcUaSub" x="5055.0" y="4200.0">
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_1" Type="QueryServiceOpcUaSub" x="5025.0" y="5690.0">
+        <Parameter Name="metadaSearch" Value="true"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2" Type="QueryServiceOpcUaSub" x="4990.0" y="7100.0">
+        <Parameter Name="metadaSearch" Value="true"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_2" Type="QueryServiceOpcUaSub" x="4800.0" y="8540.0">
+        <Parameter Name="metadaSearch" Value="true"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1" Type="QueryServiceOpcUaSub" x="5075.0" y="10135.0">
+        <Parameter Name="metadaSearch" Value="true"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1" Type="QueryServiceOpcUaSub" x="5020.0" y="11530.0">
+        <Parameter Name="metadaSearch" Value="true"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1_1" Type="QueryServiceOpcUaSub" x="5090.0" y="12925.0">
+        <Parameter Name="metadaSearch" Value="true"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1_1_1" Type="QueryServiceOpcUaSub" x="5015.0" y="14485.0">
+        <Parameter Name="metadaSearch" Value="false"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <EventConnections>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="290.0"/>
+        <Connection Comment="" Destination="LowerVersion.REQ" Source="F_EQ_4.CNF" dx1="425.0"/>
+        <Connection Comment="" Destination="F_EQ_4.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="SameVersion.REQ" Source="F_EQ_4_1.CNF"/>
+        <Connection Comment="" Destination="F_EQ_4_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="290.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="290.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="OneInterfaceOutOfTwo.REQ" Source="F_EQ_4_1_1.CNF" dx1="390.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2.REQ" Source="GET_AT_INDEX_1_2.CNF" dx1="290.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="OneInterfaceOutOfTwo_2.REQ" Source="F_EQ_4_1_2.CNF" dx1="390.0"/>
+        <Connection Comment="" Destination="WrongInterface.REQ" Source="F_EQ_4_1_2_1.CNF" dx1="345.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1.REQ" Source="GET_AT_INDEX_1_2_1.CNF" dx1="290.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1.CNF" dx1="225.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="OnlyOneMetadata.REQ" Source="F_EQ_4_1_2_1_1.CNF" dx1="370.0"/>
+        <Connection Comment="" Destination="NoMetadataAndAsked.REQ" Source="F_EQ_4_1_2_1_1_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1.CNF" dx1="140.0"/>
+        <Connection Comment="" Destination="NoInterface.REQ" Source="F_EQ_4_1_2_1_2.CNF" dx1="300.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.REQ" Source="GET_AT_INDEX_1_2_1_2.CNF" dx1="225.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_2.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.CNF" dx1="725.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1_1.CNF" dx1="60.0" dx2="60.0" dy="20.0"/>
+        <Connection Comment="" Destination="WrongMetadaButNotAsked.REQ" Source="F_EQ_4_1_2_1_1_1_1.CNF"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.CNF" dx1="640.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1.REQ" Source="LowerVersion.CNF" dx1="55.0" dx2="55.0" dy="670.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_1.REQ" Source="SameVersion.CNF" dx1="55.0" dx2="55.0" dy="765.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2.REQ" Source="OneInterfaceOutOfTwo.CNF" dx1="55.0" dx2="55.0" dy="720.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_2.REQ" Source="OneInterfaceOutOfTwo_2.CNF" dx1="55.0" dx2="55.0" dy="800.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1.REQ" Source="NoInterface.CNF" dx1="55.0" dx2="55.0" dy="820.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1.REQ" Source="WrongInterface.CNF" dx1="55.0" dx2="55.0" dy="715.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1.REQ" Source="OnlyOneMetadata.CNF" dx1="55.0" dx2="55.0" dy="720.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1_1.REQ" Source="NoMetadataAndAsked.CNF" dx1="55.0" dx2="55.0" dy="800.0"/>
+        <Connection Comment="" Destination="RegisterServiceFullHTTP.register" Source="SUBL_0.IND" dx1="2000.0"/>
+        <Connection Comment="" Destination="RegisterServiceFullHTTP.unregister" Source="WrongMetadaButNotAsked.CNF" dx1="55.0" dx2="55.0" dy="-6965.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="RegisterServiceFullHTTP.doneRegister" dx1="55.0" dx2="55.0" dy="1200.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="FieldsToArrowheadService.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryServiceHTTPSub.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1.REQ" Source="FieldsToArrowheadService_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryServiceHTTPSub_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_1.REQ" Source="FieldsToArrowheadService_1_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="QueryServiceHTTPSub_1_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2.REQ" Source="FieldsToArrowheadService_1_2.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2.REQ" Source="QueryServiceHTTPSub_1_2.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.REQ" Source="FieldsToArrowheadService_1_2_1_2.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.REQ" Source="QueryServiceHTTPSub_1_2_1_2.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1.REQ" Source="FieldsToArrowheadService_1_2_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1.REQ" Source="QueryServiceHTTPSub_1_2_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1_1.CNF" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1_1.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="2895.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="RegisterServiceFullHTTP.doneUnregister" dx1="445.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="290.0"/>
+        <Connection Comment="" Destination="LowerVersion.check" Source="F_EQ_4.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="SameVersion.check" Source="F_EQ_4_1.OUT"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="290.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="290.0"/>
+        <Connection Comment="" Destination="OneInterfaceOutOfTwo.check" Source="F_EQ_4_1_1.OUT" dx1="390.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2.OUT" dx1="290.0"/>
+        <Connection Comment="" Destination="OneInterfaceOutOfTwo_2.check" Source="F_EQ_4_1_2.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="WrongInterface.check" Source="F_EQ_4_1_2_1.OUT" dx1="345.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1.OUT" dx1="290.0"/>
+        <Connection Comment="" Destination="OnlyOneMetadata.check" Source="F_EQ_4_1_2_1_1.OUT" dx1="300.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1.OUT" dx1="225.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="NoMetadataAndAsked.check" Source="F_EQ_4_1_2_1_1_1.OUT" dx1="255.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1.OUT" dx1="140.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="NoInterface.check" Source="F_EQ_4_1_2_1_2.OUT" dx1="300.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_2.OUT" dx1="225.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.endpoint" dx1="725.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1_1.OUT" dx1="60.0" dx2="60.0" dy="-30.0"/>
+        <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.endpoint" dx1="640.0"/>
+        <Connection Comment="" Destination="WrongMetadaButNotAsked.check" Source="F_EQ_4_1_2_1_1_1_1.OUT"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="FieldsToArrowheadService.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1.service" Source="FieldsToArrowheadService_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_1.service" Source="FieldsToArrowheadService_1_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2.service" Source="FieldsToArrowheadService_1_2.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.service" Source="FieldsToArrowheadService_1_2_1_2.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_2.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1.service" Source="FieldsToArrowheadService_1_2_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1.service" Source="FieldsToArrowheadService_1_2_1_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1.serviceEntries" dx1="325.0"/>
+        <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1_1.arrowheadService" dx1="255.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1_1.serviceEntries" dx1="325.0"/>
+      </DataConnections>
+    </SubAppNetwork>
+  </Application>
+  <Application Comment="" Name="OpcUaTest6RegisterMoreServiceSubApp">
+    <SubAppNetwork>
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="825.0" y="290.0">
+        <Parameter Name="ID" Value="%versionEnded%"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="13500.0" y="10115.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="11765.0" y="10100.0">
+        <Parameter Name="INDEX" Value="1"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="13505.0" y="9140.0"/>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="2180.0" y="3300.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="20275.0" y="10730.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="11770.0" y="9220.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="Pos1Empty2" Type="TEST_CONDITION" x="21365.0" y="12865.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="20090.0" y="12810.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="Pos1Empty" Type="TEST_CONDITION" x="21525.0" y="10740.0"/>
+      <SubApp Comment="" Name="Sequencer" x="5540.0" y="8165.0">
+        <SubAppInterfaceList>
+          <SubAppEventInputs>
+            <SubAppEvent Comment="" Name="Next" Type="Event"/>
+          </SubAppEventInputs>
+          <SubAppEventOutputs>
+            <SubAppEvent Comment="" Name="E0" Type="Event"/>
+            <SubAppEvent Comment="" Name="E1" Type="Event"/>
+            <SubAppEvent Comment="" Name="E2" Type="Event"/>
+            <SubAppEvent Comment="" Name="E3" Type="Event"/>
+            <SubAppEvent Comment="" Name="E4" Type="Event"/>
+            <SubAppEvent Comment="" Name="E5" Type="Event"/>
+            <SubAppEvent Comment="" Name="E6" Type="Event"/>
+            <SubAppEvent Comment="" Name="E7" Type="Event"/>
+            <SubAppEvent Comment="" Name="E8" Type="Event"/>
+            <SubAppEvent Comment="" Name="E9" Type="Event"/>
+            <SubAppEvent Comment="" Name="E10" Type="Event"/>
+            <SubAppEvent Comment="" Name="E11" Type="Event"/>
+          </SubAppEventOutputs>
+        </SubAppInterfaceList>
+        <SubAppNetwork>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
+          <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
+            <Parameter Name="IN2" Value="INT#3"/>
+          </FB>
+          <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="8250.0" y="2575.0"/>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
+            <Parameter Name="IN2" Value="INT#4"/>
+          </FB>
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
+            <Parameter Name="IN2" Value="INT#7"/>
+          </FB>
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
+            <Parameter Name="IN2" Value="INT#8"/>
+          </FB>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
+          <EventConnections>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_MERGE.EO" dx1="410.0" dx2="55.0" dy="-1425.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO0" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO1" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO2" dx1="610.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO3" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO2" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO1" dx1="165.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI1" Source="E_DEMUX.EO0" dx1="165.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="445.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1200.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1200.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1200.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1200.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1.EO3" dx1="110.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO0" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO1" dx1="875.0"/>
+            <Connection Comment="" Destination="E_MERGE.EI2" Source="E_DEMUX_1_1.EO2" dx1="875.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
+          </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+          </DataConnections>
+        </SubAppNetwork>
+      </SubApp>
+      <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="11775.0" y="12635.0">
+        <Parameter Name="INDEX" Value="1"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="13510.0" y="12655.0"/>
+      <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_2" Type="GetEndpointFromServiceRegistryEntry" x="13515.0" y="11680.0"/>
+      <FB Comment="" Name="GET_AT_INDEX_2" Type="GET_AT_INDEX" x="11780.0" y="11760.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <FB Comment="" Name="Pos0Service1" Type="TEST_CONDITION" x="21440.0" y="10120.0"/>
+      <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="20215.0" y="10100.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="20115.0" y="12020.0">
+        <Parameter Name="IN1" Value="%validEndpoint2%"/>
+      </FB>
+      <FB Comment="" Name="Pos0Service2" Type="TEST_CONDITION" x="21340.0" y="12040.0"/>
+      <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="9075.0" y="7585.0">
+        <Parameter Name="ID" Value="%test6Ended%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="20015.0" y="14735.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_3_1_1" Type="F_EQ" x="20040.0" y="13945.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="Pos1Empty3" Type="TEST_CONDITION" x="21290.0" y="14790.0"/>
+      <FB Comment="" Name="Pos0Empty3" Type="TEST_CONDITION" x="21265.0" y="13965.0"/>
+      <FB Comment="" Name="F_EQ_1_1_1" Type="F_EQ" x="19955.0" y="16260.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="Pos0Empty4" Type="TEST_CONDITION" x="21205.0" y="15490.0"/>
+      <FB Comment="" Name="Pos1Empty4" Type="TEST_CONDITION" x="21230.0" y="16315.0"/>
+      <FB Comment="" Name="F_EQ_3_1_1_1" Type="F_EQ" x="19980.0" y="15470.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="22645.0" y="13330.0"/>
+      <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="15455.0" y="11020.0"/>
+      <SubApp Comment="" Name="RegisterManyServices" Type="RegisterMultipleServicesOpcUa" x="6455.0" y="4225.0">
+        <Parameter Name="serviceDefinition" Value="[&quot;serviceTest&quot;, &quot;serviceTest2&quot;]"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        <Parameter Name="serviceURI" Value="[&quot;%serviceURI%&quot;, &quot;%serviceURI2%&quot;]"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SREndpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QueryFirstService" Type="QueryServiceOpcUaSubFull" x="8720.0" y="9620.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        <Parameter Name="metadaSearch" Value="false"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="QuerySecondService" Type="QueryServiceOpcUaSubFull" x="8800.0" y="11665.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        <Parameter Name="metadaSearch" Value="false"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <EventConnections>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="780.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="55.0" dx2="55.0" dy="430.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="GET_AT_INDEX_2.CNF" dx1="55.0" dx2="55.0" dy="435.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="570.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="55.0" dx2="55.0" dy="480.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_2.CNF" dx1="55.0" dx2="55.0" dy="435.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="790.0"/>
+        <Connection Comment="" Destination="F_EQ_2.REQ" Source="F_EQ_3.CNF" dx1="55.0" dx2="55.0" dy="245.0"/>
+        <Connection Comment="" Destination="Pos0Service1.REQ" Source="F_EQ_2.CNF" dx1="425.0"/>
+        <Connection Comment="" Destination="Pos1Empty.REQ" Source="Pos0Service1.CNF" dx1="55.0" dx2="55.0" dy="305.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="F_EQ_3_1.CNF" dx1="55.0" dx2="55.0" dy="470.0"/>
+        <Connection Comment="" Destination="Pos0Service2.REQ" Source="F_EQ_1.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="Pos1Empty2.REQ" Source="Pos0Service2.CNF" dx1="55.0" dx2="55.0" dy="455.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToArrowheadSystem.CNF" dx1="1030.0"/>
+        <Connection Comment="" Destination="Pos0Empty3.REQ" Source="F_EQ_3_1_1.CNF" dx1="415.0"/>
+        <Connection Comment="" Destination="Pos1Empty3.REQ" Source="F_EQ_1_1.CNF" dx1="440.0"/>
+        <Connection Comment="" Destination="Pos1Empty4.REQ" Source="F_EQ_1_1_1.CNF" dx1="440.0"/>
+        <Connection Comment="" Destination="Pos0Empty4.REQ" Source="F_EQ_3_1_1_1.CNF" dx1="415.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Pos0Empty3.CNF" dx1="55.0" dx2="55.0" dy="380.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1_1.REQ" Source="Pos0Empty4.CNF" dx1="55.0" dx2="55.0" dy="375.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="55.0" dx2="55.0" dy="5555.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty.CNF" dx1="205.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty2.CNF" dx1="285.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty3.CNF" dx1="325.0"/>
+        <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty4.CNF" dx1="355.0"/>
+        <Connection Comment="" Destination="F_EQ_3.REQ" Source="Sequencer.E2" dx1="13100.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI1" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="200.0"/>
+        <Connection Comment="" Destination="E_MERGE_1.EI2" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="120.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="55.0" dx2="55.0" dy="-1425.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="Sequencer.E4" dx1="7090.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1_1.REQ" Source="Sequencer.E7" dx1="1805.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1_1_1.REQ" Source="Sequencer.E9" dx1="7055.0"/>
+        <Connection Comment="" Destination="RegisterManyServices.register" Source="Sequencer.E0" dx1="260.0"/>
+        <Connection Comment="" Destination="RegisterManyServices.unregister" Source="Sequencer.E5" dx1="380.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.registerDone" dx1="55.0" dx2="55.0" dy="1965.0"/>
+        <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.unregisterUndone" dx1="55.0" dx2="55.0" dy="1915.0"/>
+        <Connection Comment="" Destination="QueryFirstService.REQ" Source="Sequencer.E1" dx1="1400.0"/>
+        <Connection Comment="" Destination="QueryFirstService.REQ" Source="Sequencer.E6" dx1="1400.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryFirstService.CNF" dx1="825.0"/>
+        <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E3" dx1="985.0"/>
+        <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E8" dx1="1430.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_2.REQ" Source="QuerySecondService.CNF" dx1="1200.0"/>
+        <Connection Comment="" Destination="PUBL_0_1.REQ" Source="Sequencer.E10" dx1="1570.0"/>
+        <Connection Comment="" Destination="PUBL_0_1.INIT" Source="SUBL_0.INITO" dx1="3875.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.serviceRegistryEntry" Source="GET_AT_INDEX_2.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="Pos1Empty2.check" Source="F_EQ_1.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="3385.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="Pos1Empty.check" Source="F_EQ_2.OUT" dx1="440.0"/>
+        <Connection Comment="" Destination="Pos0Service2.check" Source="F_EQ_3_1.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="3045.0"/>
+        <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="575.0"/>
+        <Connection Comment="" Destination="Pos0Service1.check" Source="F_EQ_3.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="3705.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="3215.0"/>
+        <Connection Comment="" Destination="Pos0Empty3.check" Source="F_EQ_3_1_1.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="Pos1Empty3.check" Source="F_EQ_1_1.OUT" dx1="440.0"/>
+        <Connection Comment="" Destination="Pos0Empty4.check" Source="F_EQ_3_1_1_1.OUT" dx1="415.0"/>
+        <Connection Comment="" Destination="Pos1Empty4.check" Source="F_EQ_1_1_1.OUT" dx1="440.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2590.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2540.0"/>
+        <Connection Comment="" Destination="F_EQ_3_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="2515.0"/>
+        <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="2465.0"/>
+        <Connection Comment="" Destination="RegisterManyServices.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1485.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryFirstService.serviceEntries" dx1="1045.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryFirstService.serviceEntries" dx1="1070.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QuerySecondService.serviceEntries" dx1="1300.0"/>
+        <Connection Comment="" Destination="GET_AT_INDEX_2.IN_ARRAY" Source="QuerySecondService.serviceEntries" dx1="935.0"/>
+      </DataConnections>
+    </SubAppNetwork>
+  </Application>
+  <Application Comment="" Name="OpcUaTest7OrchestrationNoRules">
+    <SubAppNetwork>
+      <FB Comment="" Name="FieldsToServiceRequestForm" Type="FieldsToServiceRequestForm" x="9050.0" y="130.0"/>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="6655.0" y="-835.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="6645.0" y="455.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <SubApp Comment="" Name="GetEndpointFromOrchestrationForm" Type="GetEndpointFromOrchestrationForm" x="14840.0" y="1300.0"/>
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="16860.0" y="1210.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="NoServiceAvailable" Type="TEST_CONDITION" x="18085.0" y="1215.0"/>
+      <FB Comment="" Name="SERVER_1" Type="SERVER_1" x="9935.0" y="4445.0">
+        <Parameter Name="ID" Value="http[/serviceTest/start2]"/>
+      </FB>
+      <FB Comment="" Name="E_SR" Type="E_SR" x="9235.0" y="4355.0"/>
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="4135.0" y="-1135.0">
+        <Parameter Name="ID" Value="%test6Ended%"/>
+      </FB>
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="4000.0" y="5675.0">
+        <Parameter Name="ID" Value="%test7Ended%"/>
+      </FB>
+      <FB Comment="" Name="GET_STRUCT_VALUE1" Type="GET_AT_INDEX" x="13665.0" y="1270.0">
+        <Parameter Name="INDEX" Value="0"/>
+      </FB>
+      <SubApp Comment="" Name="Sequencer_1" x="150.0" y="2570.0">
+        <SubAppInterfaceList>
+          <SubAppEventInputs>
+            <SubAppEvent Comment="" Name="Next" Type="Event"/>
+          </SubAppEventInputs>
+          <SubAppEventOutputs>
+            <SubAppEvent Comment="" Name="E0" Type="Event"/>
+            <SubAppEvent Comment="" Name="E1" Type="Event"/>
+            <SubAppEvent Comment="" Name="E2" Type="Event"/>
+            <SubAppEvent Comment="" Name="E3" Type="Event"/>
+            <SubAppEvent Comment="" Name="E4" Type="Event"/>
+            <SubAppEvent Comment="" Name="E5" Type="Event"/>
+            <SubAppEvent Comment="" Name="E6" Type="Event"/>
+            <SubAppEvent Comment="" Name="E7" Type="Event"/>
+            <SubAppEvent Comment="" Name="E8" Type="Event"/>
+            <SubAppEvent Comment="" Name="E9" Type="Event"/>
+            <SubAppEvent Comment="" Name="E10" Type="Event"/>
+            <SubAppEvent Comment="" Name="E11" Type="Event"/>
+          </SubAppEventOutputs>
+        </SubAppInterfaceList>
+        <SubAppNetwork>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
+          <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3075.0" y="1365.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2230.0" y="1360.0">
+            <Parameter Name="IN2" Value="INT#3"/>
+          </FB>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
+            <Parameter Name="IN2" Value="INT#4"/>
+          </FB>
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
+            <Parameter Name="IN2" Value="INT#7"/>
+          </FB>
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
+            <Parameter Name="IN2" Value="INT#8"/>
+          </FB>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
+          <EventConnections>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="750.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="750.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="750.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="750.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1.EO1" dx1="445.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="1200.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="1200.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="1200.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="1200.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="1010.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO3" dx1="55.0" dx2="55.0" dy="525.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO2" dx1="55.0" dx2="55.0" dy="730.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO1" dx1="55.0" dx2="55.0" dy="805.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO0" dx1="55.0" dx2="55.0" dy="740.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO2" dx1="55.0" dx2="55.0" dy="-1120.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO1" dx1="55.0" dx2="55.0" dy="-820.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO0" dx1="55.0" dx2="55.0" dy="-960.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO3" dx1="55.0" dx2="55.0" dy="-370.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO2" dx1="55.0" dx2="55.0" dy="-410.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO1" dx1="55.0" dx2="55.0" dy="-325.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO0" dx1="55.0" dx2="55.0" dy="-470.0"/>
+          </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+          </DataConnections>
+        </SubAppNetwork>
+      </SubApp>
+      <FB Comment="" Name="RequestOrchestrationForm" Type="RequestOrchestrationForm" x="11675.0" y="1800.0">
+        <Parameter Name="endpoint" Value="%orchestratorAddress%"/>
+      </FB>
+      <FB Comment="" Name="RequestOrchestrationHTTP" Type="RequestOrchestrationOpcUa" x="13705.0" y="2405.0"/>
+      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialOpcUa" x="9190.0" y="2355.0">
+        <Parameter Name="serviceURI" Value="%serviceURI2%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <FB Comment="" Name="SERVER_1_1" Type="SERVER_0" x="9900.0" y="5600.0">
+        <Parameter Name="ID" Value="opc_ua[CREATE_METHOD;/Objects/serviceTest/start2]"/>
+      </FB>
+      <EventConnections>
+        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="55.0" dx2="55.0" dy="645.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRequestForm.REQ" Source="Service1.CNF" dx1="575.0"/>
+        <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromOrchestrationForm.CNF" dx1="365.0"/>
+        <Connection Comment="" Destination="SERVER_1.INIT" Source="E_SR.EO" dx1="215.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="1040.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.REQ" Source="GET_STRUCT_VALUE1.CNF" dx1="200.0"/>
+        <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E3" dx1="6805.0"/>
+        <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E5" dx1="7305.0"/>
+        <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E7" dx1="6900.0"/>
+        <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E10" dx1="7505.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="NoServiceAvailable.CNF" dx1="55.0" dx2="55.0" dy="6100.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="FieldsToServiceRequestForm.CNF" dx1="55.0" dx2="525.0" dy="-2185.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E0" dx1="3385.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E2" dx1="4105.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E4" dx1="4755.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E6" dx1="4985.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E9" dx1="5575.0"/>
+        <Connection Comment="" Destination="GET_STRUCT_VALUE1.REQ" Source="RequestOrchestrationForm.responseReceived" dx1="60.0"/>
+        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer_1.E1" dx1="3745.0"/>
+        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer_1.E8" dx1="5285.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneRegister" dx1="55.0" dx2="55.0" dy="-3765.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneUnregister" dx1="420.0" dx2="200.0" dy="-4215.0"/>
+        <Connection Comment="" Destination="SERVER_1_1.INIT" Source="E_SR.EO" dx1="185.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="SERVER_1_1.INITO" dx1="55.0" dx2="515.0" dy="2115.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="60.0" dx2="60.0" dy="3405.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1.E11" dx1="1755.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="FieldsToServiceRequestForm.requesterSystem" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="545.0"/>
+        <Connection Comment="" Destination="FieldsToServiceRequestForm.requestedService" Source="Service1.arrowheadService" dx1="575.0"/>
+        <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationForm.endpoint" dx1="365.0"/>
+        <Connection Comment="" Destination="SERVER_1.QI" Source="E_SR.Q" dx1="215.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.orchestrationForm" Source="GET_STRUCT_VALUE1.OUT" dx1="205.0"/>
+        <Connection Comment="" Destination="RequestOrchestrationForm.serviceRequestForm" Source="FieldsToServiceRequestForm.serviceRequestForm" dx1="345.0"/>
+        <Connection Comment="" Destination="GET_STRUCT_VALUE1.IN_ARRAY" Source="RequestOrchestrationForm.orchestrationResponse" dx1="60.0"/>
+        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="75.0"/>
+        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="150.0"/>
+        <Connection Comment="" Destination="SERVER_1_1.QI" Source="E_SR.Q" dx1="185.0"/>
+      </DataConnections>
+      <AdapterConnections>
+        <Connection Comment="" Destination="RequestOrchestrationHTTP.requestOrchestration" Source="RequestOrchestrationForm.requestOrchestration" dx1="100.0"/>
+      </AdapterConnections>
+    </SubAppNetwork>
+  </Application>
+  <Application Comment="" Name="OpcUaTest8OrchestrationWithRules">
+    <SubAppNetwork>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="7485.0" y="1090.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="7475.0" y="2390.0">
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="19620.0" y="3100.0">
+        <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="NoServiceAvailable" Type="TEST_CONDITION" x="20845.0" y="3100.0"/>
+      <FB Comment="" Name="SERVER_1" Type="SERVER_1" x="11700.0" y="6300.0">
+        <Parameter Name="ID" Value="http[/serviceTest/start]"/>
+      </FB>
+      <FB Comment="" Name="E_SR" Type="E_SR" x="10065.0" y="6290.0"/>
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="4965.0" y="790.0">
+        <Parameter Name="ID" Value="%test7Ended%"/>
+      </FB>
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="4825.0" y="7610.0">
+        <Parameter Name="ID" Value="%test8Ended%"/>
+      </FB>
+      <SubApp Comment="" Name="Sequencer_1" x="980.0" y="4505.0">
+        <SubAppInterfaceList>
+          <SubAppEventInputs>
+            <SubAppEvent Comment="" Name="Next" Type="Event"/>
+          </SubAppEventInputs>
+          <SubAppEventOutputs>
+            <SubAppEvent Comment="" Name="E0" Type="Event"/>
+            <SubAppEvent Comment="" Name="E1" Type="Event"/>
+            <SubAppEvent Comment="" Name="E2" Type="Event"/>
+            <SubAppEvent Comment="" Name="E3" Type="Event"/>
+            <SubAppEvent Comment="" Name="E4" Type="Event"/>
+            <SubAppEvent Comment="" Name="E5" Type="Event"/>
+            <SubAppEvent Comment="" Name="E6" Type="Event"/>
+            <SubAppEvent Comment="" Name="E7" Type="Event"/>
+            <SubAppEvent Comment="" Name="E8" Type="Event"/>
+            <SubAppEvent Comment="" Name="E9" Type="Event"/>
+            <SubAppEvent Comment="" Name="E10" Type="Event"/>
+            <SubAppEvent Comment="" Name="E11" Type="Event"/>
+            <SubAppEvent Comment="" Name="E12" Type="Event"/>
+            <SubAppEvent Comment="" Name="E13" Type="Event"/>
+            <SubAppEvent Comment="" Name="E14" Type="Event"/>
+            <SubAppEvent Comment="" Name="E15" Type="Event"/>
+          </SubAppEventOutputs>
+        </SubAppInterfaceList>
+        <SubAppNetwork>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
+          <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3030.0" y="270.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2185.0" y="265.0">
+            <Parameter Name="IN2" Value="INT#3"/>
+          </FB>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
+            <Parameter Name="IN2" Value="INT#4"/>
+          </FB>
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
+            <Parameter Name="IN2" Value="INT#7"/>
+          </FB>
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
+            <Parameter Name="IN2" Value="INT#8"/>
+          </FB>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
+          <FB Comment="" Name="F_GT_1_1" Type="F_GT" x="2155.0" y="3575.0">
+            <Parameter Name="IN2" Value="INT#11"/>
+          </FB>
+          <FB Comment="" Name="E_SWITCH_1_1" Type="E_SWITCH" x="3005.0" y="3590.0"/>
+          <FB Comment="" Name="E_DEMUX_1_1_1" Type="E_DEMUX" x="5945.0" y="5345.0"/>
+          <FB Comment="" Name="F_SUB_1_1" Type="F_SUB" x="4805.0" y="5165.0">
+            <Parameter Name="IN2" Value="INT#12"/>
+          </FB>
+          <EventConnections>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="710.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="710.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="710.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO3" dx1="55.0" dx2="55.0" dy="525.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO2" dx1="55.0" dx2="55.0" dy="730.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO1" dx1="55.0" dx2="55.0" dy="805.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO0" dx1="55.0" dx2="55.0" dy="740.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO2" dx1="55.0" dx2="55.0" dy="-1120.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO1" dx1="55.0" dx2="55.0" dy="-820.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO0" dx1="55.0" dx2="55.0" dy="-960.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO3" dx1="55.0" dx2="55.0" dy="-370.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO2" dx1="55.0" dx2="55.0" dy="-410.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO1" dx1="55.0" dx2="55.0" dy="-325.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO0" dx1="55.0" dx2="55.0" dy="-470.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1_1.EI" Source="F_GT_1_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1_1.EI" Source="F_SUB_1_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E12" Source="E_DEMUX_1_1_1.EO0" dx1="695.0"/>
+            <Connection Comment="" Destination="E13" Source="E_DEMUX_1_1_1.EO1" dx1="695.0"/>
+            <Connection Comment="" Destination="E14" Source="E_DEMUX_1_1_1.EO2" dx1="695.0"/>
+            <Connection Comment="" Destination="E15" Source="E_DEMUX_1_1_1.EO3" dx1="695.0"/>
+            <Connection Comment="" Destination="F_GT_1_1.REQ" Source="E_SWITCH_1.EO1" dx1="55.0" dx2="55.0" dy="765.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1_1.EO0" dx1="680.0"/>
+            <Connection Comment="" Destination="F_SUB_1_1.REQ" Source="E_SWITCH_1_1.EO1" dx1="650.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO0" dx1="55.0" dx2="55.0" dy="-2420.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO1" dx1="55.0" dx2="55.0" dy="-2470.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO2" dx1="55.0" dx2="55.0" dy="-2520.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO3" dx1="55.0" dx2="55.0" dy="-2570.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="710.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO3" dx1="55.0" dx2="55.0" dy="-1930.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="990.0"/>
+          </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1_1.G" Source="F_GT_1_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1_1.K" Source="F_SUB_1_1.OUT" dx1="370.0"/>
+            <Connection Comment="" Destination="F_SUB_1_1.IN1" Source="E_CTU.CV" dx1="1770.0"/>
+            <Connection Comment="" Destination="F_GT_1_1.IN1" Source="E_CTU.CV" dx1="445.0"/>
+          </DataConnections>
+        </SubAppNetwork>
+      </SubApp>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="19575.0" y="4065.0">
+        <Parameter Name="IN1" Value="%validEndpoint%"/>
+      </FB>
+      <FB Comment="" Name="ServiceAvailable" Type="TEST_CONDITION" x="20800.0" y="4070.0"/>
+      <FB Comment="" Name="E_SR_1" Type="E_SR" x="17120.0" y="2220.0"/>
+      <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="18140.0" y="2245.0"/>
+      <FB Comment="" Name="STRING2STRING" Type="STRING2STRING" x="14700.0" y="6800.0"/>
+      <FB Comment="" Name="SERVER_1_1" Type="SERVER_0" x="10800.0" y="7600.0">
+        <Parameter Name="ID" Value="opc_ua[CREATE_METHOD;/Objects/serviceTest/start2]"/>
+      </FB>
+      <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialOpcUa" x="10020.0" y="4290.0">
+        <Parameter Name="serviceURI" Value="%serviceURI%"/>
+        <Parameter Name="version" Value="%serviceVersion%"/>
+        <Parameter Name="udp" Value="false"/>
+        <Parameter Name="metadata" Value="%metadata%"/>
+        <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+      </SubApp>
+      <SubApp Comment="" Name="GetEndpointFromOrchestrationHTTPPFull" Type="GetEndpointFromOrchestrationOpcUaFull" x="12900.0" y="2900.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+        <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+        <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        <Parameter Name="orchestratorEndpoint" Value="%orchestratorAddress%"/>
+        <Parameter Name="INDEX" Value="0"/>
+      </SubApp>
+      <FB Comment="" Name="E_DELAY" Type="E_DELAY" x="15195.0" y="295.0">
+        <Parameter Name="DT" Value="T#1s"/>
+      </FB>
+      <FB Comment="" Name="E_DELAY_1" Type="E_DELAY" x="19725.0" y="325.0">
+        <Parameter Name="DT" Value="T#1s"/>
+      </FB>
+      <FB Comment="" Name="STRING2STRING_3" Type="STRING2STRING" x="12240.0" y="1540.0">
+        <Parameter Name="IN" Value="STRING#%authRuleData%"/>
+      </FB>
+      <FB Comment="" Name="STRING2STRING_3_1" Type="STRING2STRING" x="17025.0" y="1425.0">
+        <Parameter Name="IN" Value="STRING#%orchRuleData%"/>
+      </FB>
+      <FB Comment="" Name="CLIENT_1_2" Type="CLIENT_1_0" x="13800.0" y="700.0">
+        <Parameter Name="QI" Value="1"/>
+        <Parameter Name="ID" Value="opc_ua[CALL_METHOD; %authRuleEndpoint%#; /Objects/2:Authorization/2:addSystemToAuthorized]"/>
+      </FB>
+      <FB Comment="" Name="CLIENT_1_2_1" Type="CLIENT_1_0" x="18405.0" y="605.0">
+        <Parameter Name="QI" Value="1"/>
+        <Parameter Name="ID" Value="opc_ua[CALL_METHOD; %orchestratorEndpoint%#; /Objects/2:Orchestrator/2:store]"/>
+      </FB>
+      <EventConnections>
+        <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF"/>
+        <Connection Comment="" Destination="SERVER_1.INIT" Source="E_SR.EO" dx1="215.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="1040.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="NoServiceAvailable.CNF" dx1="55.0" dx2="55.0" dy="6100.0"/>
+        <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="55.0" dx2="55.0" dy="645.0"/>
+        <Connection Comment="" Destination="ServiceAvailable.REQ" Source="F_EQ_1.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="490.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="E_SWITCH.EO0" dx1="700.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="E_SR_1.EO" dx1="160.0" dx2="55.0" dy="1400.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="SERVER_1.INITO" dx1="55.0" dx2="515.0" dy="2115.0"/>
+        <Connection Comment="" Destination="STRING2STRING.REQ" Source="SERVER_1.IND" dx1="1230.0"/>
+        <Connection Comment="" Destination="SERVER_1.RSP" Source="STRING2STRING.CNF" dx1="55.0" dx2="55.0" dy="-930.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="ServiceAvailable.CNF" dx1="55.0" dx2="55.0" dy="7155.0"/>
+        <Connection Comment="" Destination="E_SR_1.S" Source="Sequencer_1.E3" dx1="7855.0"/>
+        <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E5" dx1="6805.0"/>
+        <Connection Comment="" Destination="E_SR_1.R" Source="Sequencer_1.E8" dx1="7855.0"/>
+        <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E10" dx1="7505.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="Service1.CNF" dx1="55.0" dx2="55.0" dy="1190.0"/>
+        <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer_1.E2" dx1="3745.0"/>
+        <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer_1.E7" dx1="5285.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneRegister" dx1="55.0" dx2="55.0" dy="-3765.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneUnregister" dx1="420.0" dx2="200.0" dy="-4215.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E11" dx1="5545.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E9" dx1="5575.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E6" dx1="4755.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E4" dx1="5070.0"/>
+        <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E1" dx1="3385.0"/>
+        <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromOrchestrationHTTPPFull.CNF" dx1="3400.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="60.0" dx2="60.0" dy="3410.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1.E12" dx1="1755.0"/>
+        <Connection Comment="" Destination="STRING2STRING_3.REQ" Source="Sequencer_1.E0" dx1="2025.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="E_SR.EO" dx1="60.0" dx2="60.0" dy="-1545.0"/>
+        <Connection Comment="" Destination="CLIENT_1_2.INIT" Source="STRING2STRING_3.CNF" dx1="430.0"/>
+        <Connection Comment="" Destination="CLIENT_1_2.REQ" Source="E_DELAY.EO" dx1="60.0" dx2="60.0" dy="-435.0"/>
+        <Connection Comment="" Destination="E_DELAY.START" Source="CLIENT_1_2.INITO" dx1="305.0"/>
+        <Connection Comment="" Destination="STRING2STRING_3_1.REQ" Source="CLIENT_1_2.CNF" dx1="1115.0"/>
+        <Connection Comment="" Destination="CLIENT_1_2_1.INIT" Source="STRING2STRING_3_1.CNF" dx1="310.0"/>
+        <Connection Comment="" Destination="CLIENT_1_2_1.REQ" Source="E_DELAY_1.EO" dx1="60.0" dx2="60.0" dy="190.0"/>
+        <Connection Comment="" Destination="E_DELAY_1.START" Source="CLIENT_1_2_1.INITO" dx1="165.0"/>
+        <Connection Comment="" Destination="Sequencer_1.Next" Source="CLIENT_1_2_1.CNF" dx1="55.0" dx2="55.0" dy="1905.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT"/>
+        <Connection Comment="" Destination="SERVER_1.QI" Source="E_SR.Q" dx1="215.0"/>
+        <Connection Comment="" Destination="ServiceAvailable.check" Source="F_EQ_1.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="E_SWITCH.G" Source="E_SR_1.Q" dx1="245.0"/>
+        <Connection Comment="" Destination="STRING2STRING.IN" Source="SERVER_1.RD_1" dx1="1230.0"/>
+        <Connection Comment="" Destination="SERVER_1.SD_1" Source="STRING2STRING.OUT" dx1="55.0" dx2="55.0" dy="420.0"/>
+        <Connection Comment="" Destination="SERVER_1_1.QI" Source="E_SR.Q" dx1="220.0"/>
+        <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="75.0"/>
+        <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="150.0"/>
+        <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint" dx1="1610.0"/>
+        <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint" dx1="1635.0"/>
+        <Connection Comment="" Destination="CLIENT_1_2.SD_1" Source="STRING2STRING_3.OUT" dx1="430.0"/>
+        <Connection Comment="" Destination="CLIENT_1_2_1.SD_1" Source="STRING2STRING_3_1.OUT" dx1="310.0"/>
+      </DataConnections>
+    </SubAppNetwork>
+  </Application>
+  <Application Comment="" Name="OpcUaTest9PublishSubscribe">
+    <SubAppNetwork>
+      <FB Comment="" Name="FieldsToPublishEvent" Type="FieldsToPublishEvent" x="9800.0" y="-900.0"/>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="1200.0" y="-1600.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="8090"/>
+      </FB>
+      <FB Comment="" Name="ArrowheadPublish" Type="ArrowheadPublish" x="12800.0" y="-200.0">
+        <Parameter Name="endpoint" Value="%eventHandlerAddress%"/>
+      </FB>
+      <FB Comment="" Name="PublishEventHTTP" Type="PublishEventOpcUa" x="14500.0" y="700.0"/>
+      <FB Comment="" Name="FieldsToArrowheadEvent" Type="FieldsToArrowheadEvent" x="1200.0" y="-600.0">
+        <Parameter Name="type" Value="%eventType%"/>
+        <Parameter Name="payload" Value="%eventPayload%"/>
+        <Parameter Name="eventMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToEventFilter" Type="FieldsToEventFilter" x="9170.0" y="2940.0">
+        <Parameter Name="eventType" Value="%eventType%"/>
+        <Parameter Name="filterMetadata" Value="%serviceMetadata%"/>
+        <Parameter Name="notifyUri" Value="WSTRING#/subscribePath"/>
+        <Parameter Name="matchMetadata" Value="BOOL#TRUE"/>
+      </FB>
+      <FB Comment="" Name="SubscribeEvent" Type="SubscribeEvent" x="11700.0" y="2500.0">
+        <Parameter Name="endpoint" Value="%eventHandlerAddress%"/>
+      </FB>
+      <FB Comment="" Name="SubscribeEventHTTP" Type="SubscribeEventOpcUa" x="14670.0" y="3640.0"/>
+      <FB Comment="" Name="E_CTU" Type="E_CTU" x="1300.0" y="6800.0"/>
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="11600.0" y="6500.0">
+        <Parameter Name="IN2" Value="UINT#0"/>
+      </FB>
+      <FB Comment="" Name="E_DELAY" Type="E_DELAY" x="9800.0" y="6100.0">
+        <Parameter Name="DT" Value="T#2s"/>
+      </FB>
+      <FB Comment="" Name="NoMessage" Type="TEST_CONDITION" x="12500.0" y="6500.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="11600.0" y="7500.0">
+        <Parameter Name="IN2" Value="UINT#1"/>
+      </FB>
+      <FB Comment="" Name="OneMessage" Type="TEST_CONDITION" x="12500.0" y="7500.0"/>
+      <FB Comment="" Name="E_DELAY_1" Type="E_DELAY" x="9800.0" y="7100.0">
+        <Parameter Name="DT" Value="T#2s"/>
+      </FB>
+      <FB Comment="" Name="E_DELAY_1_1" Type="E_DELAY" x="9900.0" y="8300.0">
+        <Parameter Name="DT" Value="T#2s"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="11700.0" y="8700.0">
+        <Parameter Name="IN2" Value="UINT#2"/>
+      </FB>
+      <FB Comment="" Name="TwoMessages" Type="TEST_CONDITION" x="12600.0" y="8700.0"/>
+      <SubApp Comment="" Name="Sequencer_1_1" x="-1300.0" y="600.0">
+        <SubAppInterfaceList>
+          <SubAppEventInputs>
+            <SubAppEvent Comment="" Name="Next" Type="Event"/>
+          </SubAppEventInputs>
+          <SubAppEventOutputs>
+            <SubAppEvent Comment="" Name="E0" Type="Event"/>
+            <SubAppEvent Comment="" Name="E1" Type="Event"/>
+            <SubAppEvent Comment="" Name="E2" Type="Event"/>
+            <SubAppEvent Comment="" Name="E3" Type="Event"/>
+            <SubAppEvent Comment="" Name="E4" Type="Event"/>
+            <SubAppEvent Comment="" Name="E5" Type="Event"/>
+            <SubAppEvent Comment="" Name="E6" Type="Event"/>
+            <SubAppEvent Comment="" Name="E7" Type="Event"/>
+            <SubAppEvent Comment="" Name="E8" Type="Event"/>
+            <SubAppEvent Comment="" Name="E9" Type="Event"/>
+            <SubAppEvent Comment="" Name="E10" Type="Event"/>
+            <SubAppEvent Comment="" Name="E11" Type="Event"/>
+            <SubAppEvent Comment="" Name="E12" Type="Event"/>
+            <SubAppEvent Comment="" Name="E13" Type="Event"/>
+            <SubAppEvent Comment="" Name="E14" Type="Event"/>
+            <SubAppEvent Comment="" Name="E15" Type="Event"/>
+          </SubAppEventOutputs>
+        </SubAppInterfaceList>
+        <SubAppNetwork>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
+          <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3030.0" y="270.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2185.0" y="265.0">
+            <Parameter Name="IN2" Value="INT#3"/>
+          </FB>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
+            <Parameter Name="IN2" Value="INT#4"/>
+          </FB>
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
+            <Parameter Name="IN2" Value="INT#7"/>
+          </FB>
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
+            <Parameter Name="IN2" Value="INT#8"/>
+          </FB>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
+          <FB Comment="" Name="F_GT_1_1" Type="F_GT" x="2155.0" y="3575.0">
+            <Parameter Name="IN2" Value="INT#11"/>
+          </FB>
+          <FB Comment="" Name="E_SWITCH_1_1" Type="E_SWITCH" x="3005.0" y="3590.0"/>
+          <FB Comment="" Name="E_DEMUX_1_1_1" Type="E_DEMUX" x="5945.0" y="5345.0"/>
+          <FB Comment="" Name="F_SUB_1_1" Type="F_SUB" x="4805.0" y="5165.0">
+            <Parameter Name="IN2" Value="INT#12"/>
+          </FB>
+          <EventConnections>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="710.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="710.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="710.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO3" dx1="55.0" dx2="55.0" dy="525.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO2" dx1="55.0" dx2="55.0" dy="730.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO1" dx1="55.0" dx2="55.0" dy="805.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO0" dx1="55.0" dx2="55.0" dy="740.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO2" dx1="55.0" dx2="55.0" dy="-1120.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO1" dx1="55.0" dx2="55.0" dy="-820.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO0" dx1="55.0" dx2="55.0" dy="-960.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO3" dx1="55.0" dx2="55.0" dy="-370.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO2" dx1="55.0" dx2="55.0" dy="-410.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO1" dx1="55.0" dx2="55.0" dy="-325.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO0" dx1="55.0" dx2="55.0" dy="-470.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1_1.EI" Source="F_GT_1_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1_1.EI" Source="F_SUB_1_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E12" Source="E_DEMUX_1_1_1.EO0" dx1="700.0"/>
+            <Connection Comment="" Destination="E13" Source="E_DEMUX_1_1_1.EO1" dx1="700.0"/>
+            <Connection Comment="" Destination="E14" Source="E_DEMUX_1_1_1.EO2" dx1="700.0"/>
+            <Connection Comment="" Destination="E15" Source="E_DEMUX_1_1_1.EO3" dx1="700.0"/>
+            <Connection Comment="" Destination="F_GT_1_1.REQ" Source="E_SWITCH_1.EO1" dx1="55.0" dx2="55.0" dy="765.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1_1.EO0" dx1="680.0"/>
+            <Connection Comment="" Destination="F_SUB_1_1.REQ" Source="E_SWITCH_1_1.EO1" dx1="650.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO0" dx1="55.0" dx2="55.0" dy="-2420.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO1" dx1="55.0" dx2="55.0" dy="-2470.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO2" dx1="55.0" dx2="55.0" dy="-2520.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO3" dx1="55.0" dx2="55.0" dy="-2570.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="710.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO3" dx1="55.0" dx2="55.0" dy="-1930.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="990.0"/>
+          </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1_1.G" Source="F_GT_1_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1_1.K" Source="F_SUB_1_1.OUT" dx1="370.0"/>
+            <Connection Comment="" Destination="F_SUB_1_1.IN1" Source="E_CTU.CV" dx1="1770.0"/>
+            <Connection Comment="" Destination="F_GT_1_1.IN1" Source="E_CTU.CV" dx1="445.0"/>
+          </DataConnections>
+        </SubAppNetwork>
+      </SubApp>
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="-3695.0" y="-2025.0">
+        <Parameter Name="ID" Value="%test8Ended%"/>
+      </FB>
+      <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="-2500.0" y="-2500.0">
+        <Parameter Name="ID" Value="%allLoaded%"/>
+      </FB>
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="1000.0" y="3800.0">
+        <Parameter Name="ID" Value="%allEnded%"/>
+      </FB>
+      <FB Comment="" Name="SERVER_1_0" Type="SERVER_1" x="35.0" y="6350.0">
+        <Parameter Name="QI" Value="1"/>
+        <Parameter Name="ID" Value="http[/subscribePath]"/>
+      </FB>
+      <FB Comment="" Name="STRING2STRING" Type="STRING2STRING" x="-1090.0" y="7590.0"/>
+      <EventConnections>
+        <Connection Comment="" Destination="ArrowheadPublish.publish" Source="FieldsToPublishEvent.CNF" dx1="755.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadEvent.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="740.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="E_DELAY.EO" dx1="685.0"/>
+        <Connection Comment="" Destination="NoMessage.REQ" Source="F_EQ.CNF"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_DELAY_1.EO" dx1="685.0"/>
+        <Connection Comment="" Destination="OneMessage.REQ" Source="F_EQ_1.CNF"/>
+        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="E_DELAY_1_1.EO" dx1="685.0"/>
+        <Connection Comment="" Destination="TwoMessages.REQ" Source="F_EQ_1_1.CNF"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="Sequencer_1_1.E0" dx1="175.0"/>
+        <Connection Comment="" Destination="FieldsToPublishEvent.REQ" Source="Sequencer_1_1.E1" dx1="5110.0"/>
+        <Connection Comment="" Destination="E_DELAY.START" Source="Sequencer_1_1.E2" dx1="5240.0"/>
+        <Connection Comment="" Destination="SubscribeEvent.Subscribe" Source="Sequencer_1_1.E3" dx1="5410.0"/>
+        <Connection Comment="" Destination="E_DELAY.START" Source="Sequencer_1_1.E4" dx1="5690.0"/>
+        <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E5" dx1="5860.0"/>
+        <Connection Comment="" Destination="E_DELAY_1.START" Source="Sequencer_1_1.E6" dx1="6050.0"/>
+        <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E7" dx1="6310.0"/>
+        <Connection Comment="" Destination="E_DELAY_1_1.START" Source="Sequencer_1_1.E8" dx1="6500.0"/>
+        <Connection Comment="" Destination="SubscribeEvent.Unsubscribe" Source="Sequencer_1_1.E9" dx1="6730.0"/>
+        <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E10" dx1="7090.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="TwoMessages.CNF" dx1="60.0" dx2="60.0" dy="1490.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="OneMessage.CNF" dx1="650.0" dx2="390.0" dy="3250.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="NoMessage.CNF" dx1="1130.0" dx2="1130.0" dy="4490.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="FieldsToEventFilter.CNF" dx1="60.0" dx2="60.0" dy="1950.0"/>
+        <Connection Comment="" Destination="E_DELAY_1_1.START" Source="Sequencer_1_1.E11" dx1="7270.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="ArrowheadPublish.published" dx1="1000.0" dx2="380.0" dy="-3680.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SubscribeEvent.Subscribed" dx1="2340.0" dx2="60.0" dy="-4970.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SubscribeEvent.Unsubscribed" dx1="2520.0" dx2="60.0" dy="-5740.0"/>
+        <Connection Comment="" Destination="PUBL_0_1.INIT" Source="SUBL_0.INITO" dx1="375.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SUBL_0.IND" dx1="950.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="PUBL_0_1.INITO" dx1="1500.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1_1.E12" dx1="860.0"/>
+        <Connection Comment="" Destination="PUBL_0_1.REQ" Source="PUBL_0.INITO" dx1="60.0" dx2="60.0" dy="-3100.0"/>
+        <Connection Comment="" Destination="SERVER_1_0.INIT" Source="FieldsToArrowheadEvent.CNF" dx1="60.0" dx2="60.0" dy="730.0"/>
+        <Connection Comment="" Destination="SERVER_1_0.RSP" Source="E_CTU.CUO" dx1="60.0" dx2="60.0" dy="-175.0"/>
+        <Connection Comment="" Destination="FieldsToEventFilter.REQ" Source="SERVER_1_0.INITO" dx1="1420.0"/>
+        <Connection Comment="" Destination="E_CTU.CU" Source="SERVER_1_0.IND" dx1="350.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="FieldsToPublishEvent.source" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1305.0"/>
+        <Connection Comment="" Destination="ArrowheadPublish.publishEvent" Source="FieldsToPublishEvent.publishEvent" dx1="530.0"/>
+        <Connection Comment="" Destination="FieldsToPublishEvent.event" Source="FieldsToArrowheadEvent.arrowheadEvent" dx1="745.0"/>
+        <Connection Comment="" Destination="SubscribeEvent.eventFilter" Source="FieldsToEventFilter.eventFilter" dx1="655.0"/>
+        <Connection Comment="" Destination="FieldsToEventFilter.consumer" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="660.0"/>
+        <Connection Comment="" Destination="F_EQ.IN1" Source="E_CTU.CV" dx1="360.0"/>
+        <Connection Comment="" Destination="NoMessage.check" Source="F_EQ.OUT"/>
+        <Connection Comment="" Destination="F_EQ_1.IN1" Source="E_CTU.CV" dx1="960.0"/>
+        <Connection Comment="" Destination="OneMessage.check" Source="F_EQ_1.OUT"/>
+        <Connection Comment="" Destination="TwoMessages.check" Source="F_EQ_1_1.OUT"/>
+        <Connection Comment="" Destination="F_EQ_1_1.IN1" Source="E_CTU.CV" dx1="640.0"/>
+        <Connection Comment="" Destination="SERVER_1_0.SD_1" Source="STRING2STRING.OUT" dx1="210.0"/>
+      </DataConnections>
+      <AdapterConnections>
+        <Connection Comment="" Destination="PublishEventHTTP.publishEvent" Source="ArrowheadPublish.ArrowheadPublishAdp" dx1="75.0"/>
+        <Connection Comment="" Destination="SubscribeEventHTTP.SubscribeEventAdp" Source="SubscribeEvent.SubscribeEventAdp" dx1="775.0"/>
+      </AdapterConnections>
+    </SubAppNetwork>
+  </Application>
+  <Application Comment="" Name="HTTPTest9PublishSubscribe">
+    <SubAppNetwork>
+      <FB Comment="" Name="FieldsToPublishEvent" Type="FieldsToPublishEvent" x="9800.0" y="-900.0"/>
+      <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="1200.0" y="-1600.0">
+        <Parameter Name="systemName" Value="%systemName%"/>
+        <Parameter Name="address" Value="%testAddress%"/>
+        <Parameter Name="port" Value="%systemPort%"/>
+      </FB>
+      <FB Comment="" Name="ArrowheadPublish" Type="ArrowheadPublish" x="12800.0" y="-200.0">
+        <Parameter Name="endpoint" Value="%eventHandlerAddress%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToArrowheadEvent" Type="FieldsToArrowheadEvent" x="1200.0" y="-600.0">
+        <Parameter Name="type" Value="%eventType%"/>
+        <Parameter Name="payload" Value="%eventPayload%"/>
+        <Parameter Name="eventMetadata" Value="%serviceMetadata%"/>
+      </FB>
+      <FB Comment="" Name="FieldsToEventFilter" Type="FieldsToEventFilter" x="9170.0" y="2940.0">
+        <Parameter Name="eventType" Value="%eventType%"/>
+        <Parameter Name="filterMetadata" Value="%serviceMetadata%"/>
+        <Parameter Name="notifyUri" Value="WSTRING#/subscribePath"/>
+        <Parameter Name="matchMetadata" Value="BOOL#TRUE"/>
+      </FB>
+      <FB Comment="" Name="SubscribeEvent" Type="SubscribeEvent" x="11700.0" y="2500.0">
+        <Parameter Name="endpoint" Value="%eventHandlerAddress%"/>
+      </FB>
+      <FB Comment="" Name="E_CTU" Type="E_CTU" x="1300.0" y="6800.0"/>
+      <FB Comment="" Name="F_EQ" Type="F_EQ" x="11600.0" y="6500.0">
+        <Parameter Name="IN2" Value="UINT#0"/>
+      </FB>
+      <FB Comment="" Name="E_DELAY" Type="E_DELAY" x="9800.0" y="6100.0">
+        <Parameter Name="DT" Value="T#2s"/>
+      </FB>
+      <FB Comment="" Name="NoMessage" Type="TEST_CONDITION" x="12500.0" y="6500.0"/>
+      <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="11600.0" y="7500.0">
+        <Parameter Name="IN2" Value="UINT#1"/>
+      </FB>
+      <FB Comment="" Name="OneMessage" Type="TEST_CONDITION" x="12500.0" y="7500.0"/>
+      <FB Comment="" Name="E_DELAY_1" Type="E_DELAY" x="9800.0" y="7100.0">
+        <Parameter Name="DT" Value="T#2s"/>
+      </FB>
+      <FB Comment="" Name="E_DELAY_1_1" Type="E_DELAY" x="9900.0" y="8300.0">
+        <Parameter Name="DT" Value="T#2s"/>
+      </FB>
+      <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="11700.0" y="8700.0">
+        <Parameter Name="IN2" Value="UINT#2"/>
+      </FB>
+      <FB Comment="" Name="TwoMessages" Type="TEST_CONDITION" x="12600.0" y="8700.0"/>
+      <SubApp Comment="" Name="Sequencer_1_1" x="-1300.0" y="600.0">
+        <SubAppInterfaceList>
+          <SubAppEventInputs>
+            <SubAppEvent Comment="" Name="Next" Type="Event"/>
+          </SubAppEventInputs>
+          <SubAppEventOutputs>
+            <SubAppEvent Comment="" Name="E0" Type="Event"/>
+            <SubAppEvent Comment="" Name="E1" Type="Event"/>
+            <SubAppEvent Comment="" Name="E2" Type="Event"/>
+            <SubAppEvent Comment="" Name="E3" Type="Event"/>
+            <SubAppEvent Comment="" Name="E4" Type="Event"/>
+            <SubAppEvent Comment="" Name="E5" Type="Event"/>
+            <SubAppEvent Comment="" Name="E6" Type="Event"/>
+            <SubAppEvent Comment="" Name="E7" Type="Event"/>
+            <SubAppEvent Comment="" Name="E8" Type="Event"/>
+            <SubAppEvent Comment="" Name="E9" Type="Event"/>
+            <SubAppEvent Comment="" Name="E10" Type="Event"/>
+            <SubAppEvent Comment="" Name="E11" Type="Event"/>
+            <SubAppEvent Comment="" Name="E12" Type="Event"/>
+            <SubAppEvent Comment="" Name="E13" Type="Event"/>
+            <SubAppEvent Comment="" Name="E14" Type="Event"/>
+            <SubAppEvent Comment="" Name="E15" Type="Event"/>
+          </SubAppEventOutputs>
+        </SubAppInterfaceList>
+        <SubAppNetwork>
+          <FB Comment="" Name="E_DEMUX" Type="E_DEMUX" x="4235.0" y="145.0"/>
+          <FB Comment="" Name="E_CTU" Type="E_CTU" x="900.0" y="500.0"/>
+          <FB Comment="" Name="E_DEMUX_1" Type="E_DEMUX" x="6085.0" y="2690.0"/>
+          <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="3030.0" y="270.0"/>
+          <FB Comment="" Name="F_GT" Type="F_GT" x="2185.0" y="265.0">
+            <Parameter Name="IN2" Value="INT#3"/>
+          </FB>
+          <FB Comment="" Name="F_SUB" Type="F_SUB" x="4830.0" y="2385.0">
+            <Parameter Name="IN2" Value="INT#4"/>
+          </FB>
+          <FB Comment="" Name="E_DEMUX_1_1" Type="E_DEMUX" x="6005.0" y="4065.0"/>
+          <FB Comment="" Name="F_GT_1" Type="F_GT" x="2235.0" y="2110.0">
+            <Parameter Name="IN2" Value="INT#7"/>
+          </FB>
+          <FB Comment="" Name="F_SUB_1" Type="F_SUB" x="4865.0" y="3885.0">
+            <Parameter Name="IN2" Value="INT#8"/>
+          </FB>
+          <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="3085.0" y="2125.0"/>
+          <FB Comment="" Name="F_GT_1_1" Type="F_GT" x="2155.0" y="3575.0">
+            <Parameter Name="IN2" Value="INT#11"/>
+          </FB>
+          <FB Comment="" Name="E_SWITCH_1_1" Type="E_SWITCH" x="3005.0" y="3590.0"/>
+          <FB Comment="" Name="E_DEMUX_1_1_1" Type="E_DEMUX" x="5945.0" y="5345.0"/>
+          <FB Comment="" Name="F_SUB_1_1" Type="F_SUB" x="4805.0" y="5165.0">
+            <Parameter Name="IN2" Value="INT#12"/>
+          </FB>
+          <EventConnections>
+            <Connection Comment="" Destination="E0" Source="E_DEMUX.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E1" Source="E_DEMUX.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E2" Source="E_DEMUX.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E3" Source="E_DEMUX.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E4" Source="E_DEMUX_1.EO0" dx1="690.0"/>
+            <Connection Comment="" Destination="E5" Source="E_DEMUX_1.EO1" dx1="690.0"/>
+            <Connection Comment="" Destination="E6" Source="E_DEMUX_1.EO2" dx1="690.0"/>
+            <Connection Comment="" Destination="E7" Source="E_DEMUX_1.EO3" dx1="690.0"/>
+            <Connection Comment="" Destination="E_SWITCH.EI" Source="F_GT.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX.EI" Source="E_SWITCH.EO0" dx1="150.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.EI" Source="F_SUB.CNF" dx1="760.0"/>
+            <Connection Comment="" Destination="F_GT_1.REQ" Source="E_SWITCH.EO1" dx1="55.0" dx2="55.0" dy="365.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.EI" Source="F_GT_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="F_SUB.REQ" Source="E_SWITCH_1.EO0" dx1="645.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.EI" Source="F_SUB_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E8" Source="E_DEMUX_1_1.EO0" dx1="710.0"/>
+            <Connection Comment="" Destination="E9" Source="E_DEMUX_1_1.EO1" dx1="710.0"/>
+            <Connection Comment="" Destination="E10" Source="E_DEMUX_1_1.EO2" dx1="710.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO3" dx1="55.0" dx2="55.0" dy="525.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO2" dx1="55.0" dx2="55.0" dy="730.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO1" dx1="55.0" dx2="55.0" dy="805.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX.EO0" dx1="55.0" dx2="55.0" dy="740.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO2" dx1="55.0" dx2="55.0" dy="-1120.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO1" dx1="55.0" dx2="55.0" dy="-820.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO0" dx1="55.0" dx2="55.0" dy="-960.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO3" dx1="55.0" dx2="55.0" dy="-370.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO2" dx1="55.0" dx2="55.0" dy="-410.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO1" dx1="55.0" dx2="55.0" dy="-325.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1.EO0" dx1="55.0" dx2="55.0" dy="-470.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1_1.EI" Source="F_GT_1_1.CNF" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1_1.EI" Source="F_SUB_1_1.CNF" dx1="370.0"/>
+            <Connection Comment="" Destination="E13" Source="E_DEMUX_1_1_1.EO1" dx1="555.0"/>
+            <Connection Comment="" Destination="E14" Source="E_DEMUX_1_1_1.EO2" dx1="695.0"/>
+            <Connection Comment="" Destination="E15" Source="E_DEMUX_1_1_1.EO3" dx1="695.0"/>
+            <Connection Comment="" Destination="F_GT_1_1.REQ" Source="E_SWITCH_1.EO1" dx1="55.0" dx2="55.0" dy="765.0"/>
+            <Connection Comment="" Destination="F_SUB_1.REQ" Source="E_SWITCH_1_1.EO0" dx1="680.0"/>
+            <Connection Comment="" Destination="F_SUB_1_1.REQ" Source="E_SWITCH_1_1.EO1" dx1="650.0"/>
+            <Connection Comment="" Destination="E_CTU.R" Source="E_DEMUX_1_1_1.EO3" dx1="310.0" dx2="55.0" dy="585.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO0" dx1="175.0" dx2="55.0" dy="-2420.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO1" dx1="350.0" dx2="55.0" dy="-2470.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO2" dx1="440.0" dx2="55.0" dy="-2520.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1_1.EO3" dx1="390.0" dx2="55.0" dy="-2570.0"/>
+            <Connection Comment="" Destination="E11" Source="E_DEMUX_1_1.EO3" dx1="455.0"/>
+            <Connection Comment="" Destination="E_CTU.CU" Source="E_DEMUX_1_1.EO3" dx1="55.0" dx2="55.0" dy="-1930.0"/>
+            <Connection Comment="" Destination="F_GT.REQ" Source="Next" dx1="990.0"/>
+            <Connection Comment="" Destination="E12" Source="E_DEMUX_1_1_1.EO0" dx1="375.0"/>
+          </EventConnections>
+          <DataConnections>
+            <Connection Comment="" Destination="E_DEMUX.K" Source="E_CTU.CV" dx1="1660.0"/>
+            <Connection Comment="" Destination="E_SWITCH.G" Source="F_GT.OUT" dx1="145.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1.K" Source="F_SUB.OUT" dx1="665.0"/>
+            <Connection Comment="" Destination="F_GT.IN1" Source="E_CTU.CV" dx1="350.0"/>
+            <Connection Comment="" Destination="F_SUB.IN1" Source="E_CTU.CV" dx1="245.0"/>
+            <Connection Comment="" Destination="F_SUB_1.IN1" Source="E_CTU.CV" dx1="100.0"/>
+            <Connection Comment="" Destination="F_GT_1.IN1" Source="E_CTU.CV" dx1="485.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1.G" Source="F_GT_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1.K" Source="F_SUB_1.OUT" dx1="370.0"/>
+            <Connection Comment="" Destination="E_SWITCH_1_1.G" Source="F_GT_1_1.OUT" dx1="225.0"/>
+            <Connection Comment="" Destination="E_DEMUX_1_1_1.K" Source="F_SUB_1_1.OUT" dx1="370.0"/>
+            <Connection Comment="" Destination="F_SUB_1_1.IN1" Source="E_CTU.CV" dx1="1770.0"/>
+            <Connection Comment="" Destination="F_GT_1_1.IN1" Source="E_CTU.CV" dx1="445.0"/>
+          </DataConnections>
+        </SubAppNetwork>
+      </SubApp>
+      <FB Comment="" Name="SERVER_1_0" Type="SERVER_1" x="35.0" y="6350.0">
+        <Parameter Name="QI" Value="1"/>
+        <Parameter Name="ID" Value="http[/subscribePath]"/>
+      </FB>
+      <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="-3695.0" y="-2025.0">
+        <Parameter Name="ID" Value="%test8Ended%"/>
+      </FB>
+      <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="-2500.0" y="-2500.0">
+        <Parameter Name="ID" Value="%allLoaded%"/>
+      </FB>
+      <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="1000.0" y="3800.0">
+        <Parameter Name="ID" Value="%allEnded%"/>
+      </FB>
+      <FB Comment="" Name="PublishEventHTTP" Type="PublishEventHTTP" x="14500.0" y="700.0"/>
+      <FB Comment="" Name="SubscribeEventHTTP" Type="SubscribeEventHTTP" x="14670.0" y="3640.0"/>
+      <EventConnections>
+        <Connection Comment="" Destination="ArrowheadPublish.publish" Source="FieldsToPublishEvent.CNF" dx1="755.0"/>
+        <Connection Comment="" Destination="FieldsToArrowheadEvent.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="740.0"/>
+        <Connection Comment="" Destination="F_EQ.REQ" Source="E_DELAY.EO" dx1="685.0"/>
+        <Connection Comment="" Destination="NoMessage.REQ" Source="F_EQ.CNF"/>
+        <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_DELAY_1.EO" dx1="685.0"/>
+        <Connection Comment="" Destination="OneMessage.REQ" Source="F_EQ_1.CNF"/>
+        <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="E_DELAY_1_1.EO" dx1="685.0"/>
+        <Connection Comment="" Destination="TwoMessages.REQ" Source="F_EQ_1_1.CNF"/>
+        <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="Sequencer_1_1.E0" dx1="175.0"/>
+        <Connection Comment="" Destination="FieldsToPublishEvent.REQ" Source="Sequencer_1_1.E1" dx1="5110.0"/>
+        <Connection Comment="" Destination="E_DELAY.START" Source="Sequencer_1_1.E2" dx1="5240.0"/>
+        <Connection Comment="" Destination="SubscribeEvent.Subscribe" Source="Sequencer_1_1.E3" dx1="5410.0"/>
+        <Connection Comment="" Destination="E_DELAY.START" Source="Sequencer_1_1.E4" dx1="5690.0"/>
+        <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E5" dx1="5860.0"/>
+        <Connection Comment="" Destination="E_DELAY_1.START" Source="Sequencer_1_1.E6" dx1="6050.0"/>
+        <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E7" dx1="6310.0"/>
+        <Connection Comment="" Destination="E_DELAY_1_1.START" Source="Sequencer_1_1.E8" dx1="6500.0"/>
+        <Connection Comment="" Destination="SubscribeEvent.Unsubscribe" Source="Sequencer_1_1.E9" dx1="6730.0"/>
+        <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E10" dx1="7090.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="TwoMessages.CNF" dx1="60.0" dx2="60.0" dy="1490.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="OneMessage.CNF" dx1="650.0" dx2="390.0" dy="3250.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="NoMessage.CNF" dx1="1130.0" dx2="1130.0" dy="4490.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="FieldsToEventFilter.CNF" dx1="60.0" dx2="60.0" dy="1950.0"/>
+        <Connection Comment="" Destination="E_DELAY_1_1.START" Source="Sequencer_1_1.E11" dx1="7270.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="ArrowheadPublish.published" dx1="1000.0" dx2="380.0" dy="-3680.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SubscribeEvent.Subscribed" dx1="2340.0" dx2="60.0" dy="-4970.0"/>
+        <Connection Comment="" Destination="SERVER_1_0.INIT" Source="FieldsToArrowheadEvent.CNF" dx1="60.0" dx2="60.0" dy="730.0"/>
+        <Connection Comment="" Destination="SERVER_1_0.RSP" Source="E_CTU.CUO" dx1="60.0" dx2="60.0" dy="865.0"/>
+        <Connection Comment="" Destination="FieldsToEventFilter.REQ" Source="SERVER_1_0.INITO" dx1="1420.0"/>
+        <Connection Comment="" Destination="E_CTU.CU" Source="SERVER_1_0.IND" dx1="370.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SubscribeEvent.Unsubscribed" dx1="2520.0" dx2="60.0" dy="-5740.0"/>
+        <Connection Comment="" Destination="PUBL_0_1.INIT" Source="SUBL_0.INITO" dx1="375.0"/>
+        <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SUBL_0.IND" dx1="950.0"/>
+        <Connection Comment="" Destination="PUBL_0.INIT" Source="PUBL_0_1.INITO" dx1="1500.0"/>
+        <Connection Comment="" Destination="PUBL_0_1.REQ" Source="PUBL_0.INITO" dx1="60.0" dx2="60.0" dy="910.0"/>
+        <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1_1.E12" dx1="860.0"/>
+      </EventConnections>
+      <DataConnections>
+        <Connection Comment="" Destination="FieldsToPublishEvent.source" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1305.0"/>
+        <Connection Comment="" Destination="ArrowheadPublish.publishEvent" Source="FieldsToPublishEvent.publishEvent" dx1="530.0"/>
+        <Connection Comment="" Destination="FieldsToPublishEvent.event" Source="FieldsToArrowheadEvent.arrowheadEvent" dx1="745.0"/>
+        <Connection Comment="" Destination="SubscribeEvent.eventFilter" Source="FieldsToEventFilter.eventFilter" dx1="655.0"/>
+        <Connection Comment="" Destination="FieldsToEventFilter.consumer" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="660.0"/>
+        <Connection Comment="" Destination="F_EQ.IN1" Source="E_CTU.CV" dx1="360.0"/>
+        <Connection Comment="" Destination="NoMessage.check" Source="F_EQ.OUT"/>
+        <Connection Comment="" Destination="F_EQ_1.IN1" Source="E_CTU.CV" dx1="960.0"/>
+        <Connection Comment="" Destination="OneMessage.check" Source="F_EQ_1.OUT"/>
+        <Connection Comment="" Destination="TwoMessages.check" Source="F_EQ_1_1.OUT"/>
+        <Connection Comment="" Destination="F_EQ_1_1.IN1" Source="E_CTU.CV" dx1="640.0"/>
+      </DataConnections>
+      <AdapterConnections>
+        <Connection Comment="" Destination="PublishEventHTTP.publishEvent" Source="ArrowheadPublish.ArrowheadPublishAdp" dx1="75.0"/>
+        <Connection Comment="" Destination="SubscribeEventHTTP.SubscribeEventAdp" Source="SubscribeEvent.SubscribeEventAdp" dx1="775.0"/>
+      </AdapterConnections>
+    </SubAppNetwork>
+  </Application>
+  <Device Comment="" Name="HTTPTest" Type="FORTE_PC" x="2000.0" y="800.0">
+    <Parameter Name="MGR_ID" Value="%httpTestAddress%"/>
     <Attribute Comment="device profile" Name="Profile" Type="STRING" Value="HOLOBLOC"/>
     <Attribute Comment="color" Name="Color" Type="STRING" Value="76,218,77"/>
     <Resource Comment="" Name="cleanAll" Type="EMB_RES" x="0.0" y="0.0">
@@ -1957,14 +4347,6 @@
         <FB Comment="" Name="SUBL_0_1" Type="SUBL_0" x="-130.0" y="105.0">
           <Parameter Name="ID" Value="%allLoaded%"/>
         </FB>
-        <DataConnections>
-          <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="615.0"/>
-          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="640.0"/>
-          <Connection Comment="" Destination="RegisterService1.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="830.0"/>
-          <Connection Comment="" Destination="RegisterService2.providedService" Source="FieldsToArrowheadService_1.arrowheadService" dx1="850.0"/>
-          <Connection Comment="" Destination="RegisterService2_1.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="845.0"/>
-          <Connection Comment="" Destination="RegisterService2_1.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem" dx1="800.0"/>
-        </DataConnections>
         <EventConnections>
           <Connection Comment="" Destination="RegisterService2.unregister" Source="RegisterService1.doneUnregister" dx1="60.0" dx2="60.0" dy="830.0"/>
           <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="310.0"/>
@@ -1977,9 +4359,17 @@
           <Connection Comment="" Destination="SUBL_0.INIT" Source="PUBL_0.INITO" dx1="60.0" dx2="60.0" dy="740.0"/>
           <Connection Comment="" Destination="STEST_END.REQ" Source="SUBL_0.IND" dx1="1685.0"/>
           <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0_1.IND" dx1="270.0"/>
-          <Connection Comment="" Destination="SUBL_0_1.INIT" Source="START.WARM" dx1="140.0"/>
-          <Connection Comment="" Destination="SUBL_0_1.INIT" Source="START.COLD" dx1="140.0"/>
+          <Connection Comment="" Destination="SUBL_0_1.INIT" Source="START.WARM" dx1="575.0"/>
+          <Connection Comment="" Destination="SUBL_0_1.INIT" Source="START.COLD" dx1="575.0"/>
         </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="615.0"/>
+          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="640.0"/>
+          <Connection Comment="" Destination="RegisterService1.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="830.0"/>
+          <Connection Comment="" Destination="RegisterService2.providedService" Source="FieldsToArrowheadService_1.arrowheadService" dx1="850.0"/>
+          <Connection Comment="" Destination="RegisterService2_1.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="845.0"/>
+          <Connection Comment="" Destination="RegisterService2_1.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem" dx1="800.0"/>
+        </DataConnections>
       </FBNetwork>
     </Resource>
     <Resource Comment="" Name="RegisterUnregister" Type="EMB_RES" x="0.0" y="0.0">
@@ -2056,26 +4446,8 @@
         <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="1140.0" y="-1280.0">
           <Parameter Name="ID" Value="%cleanFinished%"/>
         </FB>
-        <DataConnections>
-          <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="265.0"/>
-          <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="635.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="460.0"/>
-          <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="540.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="305.0"/>
-          <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="310.0"/>
-          <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="490.0"/>
-          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1635.0"/>
-          <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="665.0"/>
-          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="570.0"/>
-          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="645.0"/>
-          <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="430.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="600.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="290.0"/>
-          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1620.0"/>
-          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="340.0"/>
-        </DataConnections>
         <EventConnections>
-          <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="275.0"/>
+          <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="105.0"/>
           <Connection Comment="" Destination="ServiceNotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="635.0"/>
           <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="460.0"/>
           <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService.queried" dx1="305.0"/>
@@ -2088,28 +4460,46 @@
           <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneRegister" dx1="60.0" dx2="60.0" dy="835.0"/>
           <Connection Comment="" Destination="Registered.S" Source="RegisterService.doneRegister" dx1="1745.0"/>
           <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="645.0"/>
-          <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="430.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="600.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="290.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="440.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="570.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="265.0"/>
           <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO0" dx1="540.0"/>
           <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="340.0"/>
           <Connection Comment="" Destination="Sequencer.Next" Source="ServiceNotRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="1585.0"/>
-          <Connection Comment="" Destination="PUBLISH_0.REQ" Source="PUBLISH_0.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
           <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToServiceQueryForm.CNF" dx1="60.0" dx2="60.0" dy="985.0"/>
           <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="860.0"/>
-          <Connection Comment="" Destination="PUBLISH_0.INIT" Source="Sequencer.E5" dx1="4740.0"/>
           <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E4" dx1="1565.0"/>
           <Connection Comment="" Destination="RegisterService.unregister" Source="Sequencer.E3" dx1="2025.0"/>
           <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E2" dx1="1565.0"/>
           <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E1" dx1="2025.0"/>
           <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E0" dx1="1565.0"/>
           <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="SUBL_0.IND" dx1="1060.0"/>
-          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="520.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="460.0"/>
           <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="370.0"/>
+          <Connection Comment="" Destination="PUBLISH_0.REQ" Source="Sequencer.E5"/>
+          <Connection Comment="" Destination="PUBLISH_0.INIT" Source="SUBL_0.INITO"/>
         </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="145.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="635.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="460.0"/>
+          <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="540.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="305.0"/>
+          <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="310.0"/>
+          <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="490.0"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1635.0"/>
+          <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="665.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="570.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="645.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="600.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="265.0"/>
+          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1620.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="340.0"/>
+        </DataConnections>
         <AdapterConnections>
-          <Connection Comment="" Destination="QueryServiceHTTP.queryServices" Source="QueryService.queryServices" dx1="225.0"/>
-          <Connection Comment="" Destination="RegisterServiceHTTP.registerService" Source="RegisterService.registerService" dx1="245.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTP.queryServices" Source="QueryService.queryServices" dx1="150.0"/>
+          <Connection Comment="" Destination="RegisterServiceHTTP.registerService" Source="RegisterService.registerService" dx1="60.0" dx2="60.0" dy="130.0"/>
         </AdapterConnections>
       </FBNetwork>
     </Resource>
@@ -2173,8 +4563,7 @@
           <Parameter Name="endpoint" Value="%serviceRegistryAddress%"/>
         </FB>
         <FB Comment="" Name="RegisterServiceHTTP" Type="RegisterServiceHTTP" x="11685.0" y="3715.0"/>
-        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="12530.0" y="1005.0"/>
-        <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="10775.0" y="990.0">
+        <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="10300.0" y="100.0">
           <Parameter Name="INDEX" Value="1"/>
         </FB>
         <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="17115.0" y="1775.0">
@@ -2187,29 +4576,12 @@
         <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="5585.0" y="4970.0">
           <Parameter Name="ID" Value="%secondResourceReady%"/>
         </FB>
-        <DataConnections>
-          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="380.0"/>
-          <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="490.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="580.0"/>
-          <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="355.0"/>
-          <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="470.0"/>
-          <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="295.0"/>
-          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1600.0"/>
-          <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="490.0"/>
-          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="650.0"/>
-          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="645.0"/>
-          <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="665.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="360.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="580.0"/>
-          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1595.0"/>
-          <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="490.0"/>
-          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="1585.0"/>
-        </DataConnections>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="12525.0" y="1000.0"/>
         <EventConnections>
           <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService.queried" dx1="380.0"/>
           <Connection Comment="" Destination="ServiceNotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="490.0"/>
           <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="580.0"/>
-          <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="355.0"/>
+          <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="315.0"/>
           <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="755.0"/>
           <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="625.0"/>
           <Connection Comment="" Destination="ServiceRegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="490.0"/>
@@ -2217,11 +4589,9 @@
           <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="645.0"/>
           <Connection Comment="" Destination="Registered.S" Source="RegisterService.doneRegister" dx1="1640.0"/>
           <Connection Comment="" Destination="Registered.R" Source="RegisterService.doneUnregister" dx1="1640.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="360.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="580.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="60.0" dx2="60.0" dy="-470.0"/>
           <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO0" dx1="620.0"/>
           <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="490.0"/>
-          <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="1585.0"/>
           <Connection Comment="" Destination="Sequencer.Next" Source="ServiceNotRegisteredPos0.CNF" dx1="60.0" dx2="930.0" dy="1365.0"/>
           <Connection Comment="" Destination="SUBSCRIBE_0.INIT" Source="START.COLD" dx1="60.0" dx2="60.0" dy="2130.0"/>
           <Connection Comment="" Destination="SUBSCRIBE_0.INIT" Source="START.WARM" dx1="60.0" dx2="60.0" dy="2080.0"/>
@@ -2236,11 +4606,31 @@
           <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneRegister" dx1="745.0" dx2="490.0" dy="660.0"/>
           <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneUnregister" dx1="450.0" dx2="780.0" dy="610.0"/>
           <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E5"/>
-          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBSCRIBE_0.INITO"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBSCRIBE_0.INITO" dx1="2285.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="785.0"/>
+          <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="1455.0"/>
         </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="380.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="490.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="580.0"/>
+          <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="315.0"/>
+          <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="470.0"/>
+          <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="295.0"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1600.0"/>
+          <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="490.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="650.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="645.0"/>
+          <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="665.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="60.0" dx2="60.0" dy="-470.0"/>
+          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1595.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="490.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="785.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="1455.0"/>
+        </DataConnections>
         <AdapterConnections>
           <Connection Comment="" Destination="QueryServiceHTTP.queryServices" Source="QueryService.queryServices" dx1="345.0"/>
-          <Connection Comment="" Destination="RegisterServiceHTTP.registerService" Source="RegisterService.registerService" dx1="245.0"/>
+          <Connection Comment="" Destination="RegisterServiceHTTP.registerService" Source="RegisterService.registerService" dx1="60.0" dx2="60.0" dy="130.0"/>
         </AdapterConnections>
       </FBNetwork>
     </Resource>
@@ -2309,11 +4699,11 @@
           <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
         </SubApp>
         <FB Comment="" Name="Service2NotRegisteredPos1" Type="TEST_CONDITION" x="15125.0" y="2465.0"/>
-        <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="13725.0" y="2515.0">
+        <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="13700.0" y="3700.0">
           <Parameter Name="IN1" Value="%emptyEndpoint%"/>
         </FB>
         <FB Comment="" Name="S2Reg" Type="E_SR" x="10215.0" y="2740.0"/>
-        <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="11180.0" y="2745.0"/>
+        <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="11200.0" y="3100.0"/>
         <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="13800.0" y="9135.0"/>
         <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_2" Type="GetEndpointFromServiceRegistryEntry" x="13805.0" y="8160.0"/>
         <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="12065.0" y="9115.0">
@@ -2332,7 +4722,7 @@
         <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="16865.0" y="4360.0">
           <Parameter Name="IN1" Value="%emptyEndpoint%"/>
         </FB>
-        <FB Comment="" Name="Service1NotRegisteredPos0" Type="TEST_CONDITION" x="18090.0" y="4380.0"/>
+        <FB Comment="" Name="Service1NotRegisteredPos0" Type="TEST_CONDITION" x="18900.0" y="4800.0"/>
         <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="16705.0" y="7880.0">
           <Parameter Name="IN1" Value="%emptyEndpoint%"/>
         </FB>
@@ -2354,36 +4744,6 @@
         <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="9025.0" y="12785.0">
           <Parameter Name="ID" Value="%testMoreServicesReady%"/>
         </FB>
-        <DataConnections>
-          <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ_2.OUT" dx1="430.0"/>
-          <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ.OUT" dx1="490.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="570.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="600.0"/>
-          <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="490.0"/>
-          <Connection Comment="" Destination="E_SWITCH.G" Source="S1Reg.Q" dx1="350.0"/>
-          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1070.0"/>
-          <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1045.0"/>
-          <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_1_1.OUT" dx1="505.0"/>
-          <Connection Comment="" Destination="E_SWITCH_1.G" Source="S2Reg.Q" dx1="355.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="535.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryService2.serviceEntries" dx1="1665.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_2.IN_ARRAY" Source="QueryService2.serviceEntries" dx1="1665.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.serviceRegistryEntry" Source="GET_AT_INDEX_2.OUT" dx1="570.0"/>
-          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="1575.0"/>
-          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1595.0"/>
-          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="1025.0"/>
-          <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="60.0" dx2="60.0" dy="-3260.0"/>
-          <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1400.0"/>
-          <Connection Comment="" Destination="Service1NotRegisteredPos0.check" Source="F_EQ_3.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="Service2NotRegisteredPos0.check" Source="F_EQ_3_1.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="735.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService1.serviceEntries" dx1="2965.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService1.serviceEntries" dx1="2935.0"/>
-          <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService"/>
-          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service2.arrowheadService"/>
-          <Connection Comment="" Destination="QueryService1.service" Source="Service1.arrowheadService"/>
-          <Connection Comment="" Destination="QueryService2.service" Source="Service2.arrowheadService"/>
-        </DataConnections>
         <EventConnections>
           <Connection Comment="" Destination="Service1RegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="430.0"/>
           <Connection Comment="" Destination="Service1NotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="490.0"/>
@@ -2430,12 +4790,42 @@
           <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E5" dx1="765.0"/>
           <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E8" dx1="765.0"/>
           <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService1.CNF" dx1="2965.0"/>
-          <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF"/>
-          <Connection Comment="" Destination="Service2.REQ" Source="Service1.CNF"/>
-          <Connection Comment="" Destination="Sequencer.Next" Source="Service2.CNF"/>
-          <Connection Comment="" Destination="PUBL_0.INIT" Source="Sequencer.E10"/>
-          <Connection Comment="" Destination="PUBL_0.REQ" Source="PUBL_0.INITO"/>
+          <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="-440.0"/>
+          <Connection Comment="" Destination="Service2.REQ" Source="Service1.CNF" dx1="60.0" dx2="60.0" dy="395.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="Service2.CNF" dx1="355.0"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E10"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO"/>
         </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ_2.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ.OUT" dx1="490.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="570.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="600.0"/>
+          <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="490.0"/>
+          <Connection Comment="" Destination="E_SWITCH.G" Source="S1Reg.Q" dx1="350.0"/>
+          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1070.0"/>
+          <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1045.0"/>
+          <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_1_1.OUT" dx1="505.0"/>
+          <Connection Comment="" Destination="E_SWITCH_1.G" Source="S2Reg.Q" dx1="335.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="535.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryService2.serviceEntries" dx1="1665.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_2.IN_ARRAY" Source="QueryService2.serviceEntries" dx1="1665.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.serviceRegistryEntry" Source="GET_AT_INDEX_2.OUT" dx1="570.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="1575.0"/>
+          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1595.0"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="1025.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="60.0" dx2="60.0" dy="-3260.0"/>
+          <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1400.0"/>
+          <Connection Comment="" Destination="Service1NotRegisteredPos0.check" Source="F_EQ_3.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="Service2NotRegisteredPos0.check" Source="F_EQ_3_1.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="735.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService1.serviceEntries" dx1="2965.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService1.serviceEntries" dx1="2935.0"/>
+          <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService" dx1="3100.0"/>
+          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service2.arrowheadService" dx1="3120.0"/>
+          <Connection Comment="" Destination="QueryService1.service" Source="Service1.arrowheadService" dx1="1315.0"/>
+          <Connection Comment="" Destination="QueryService2.service" Source="Service2.arrowheadService" dx1="3155.0"/>
+        </DataConnections>
       </FBNetwork>
     </Resource>
     <Resource Comment="" Name="SameServiceTwice" Type="EMB_RES" x="0.0" y="0.0">
@@ -2552,43 +4942,6 @@
         <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="5855.0" y="7815.0">
           <Parameter Name="ID" Value="%sameServiceTwiceReady%"/>
         </FB>
-        <DataConnections>
-          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="3290.0"/>
-          <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService" dx1="3270.0"/>
-          <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="3245.0"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="Service1.arrowheadService" dx1="615.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="625.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="630.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="570.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="570.0"/>
-          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4395.0"/>
-          <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4440.0"/>
-          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4850.0"/>
-          <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="F_EQ_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4385.0"/>
-          <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4430.0"/>
-          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4805.0"/>
-          <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="450.0"/>
-          <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4810.0"/>
-          <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4775.0"/>
-          <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4815.0"/>
-          <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_4.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4780.0"/>
-          <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ_4_1.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="F_AND.IN1" Source="F_EQ_1_1.OUT" dx1="355.0"/>
-          <Connection Comment="" Destination="F_AND.IN2" Source="F_EQ_1_1_1.OUT" dx1="355.0"/>
-          <Connection Comment="" Destination="BothServicesNotRegistered.check" Source="F_AND.OUT" dx1="370.0"/>
-          <Connection Comment="" Destination="F_AND_1.IN1" Source="F_EQ_3_1.OUT" dx1="270.0"/>
-          <Connection Comment="" Destination="F_AND_1.IN2" Source="F_EQ_2_1.OUT" dx1="280.0"/>
-          <Connection Comment="" Destination="BothServicesRegistered.check" Source="F_OR.OUT" dx1="60.0" dx2="60.0" dy="-50.0"/>
-          <Connection Comment="" Destination="F_AND_1_1.IN1" Source="F_EQ_3.OUT" dx1="255.0"/>
-          <Connection Comment="" Destination="F_AND_1_1.IN2" Source="F_EQ_2.OUT" dx1="270.0"/>
-          <Connection Comment="" Destination="BOOL2BOOL.IN" Source="F_AND_1.OUT" dx1="235.0"/>
-          <Connection Comment="" Destination="F_OR.IN1" Source="BOOL2BOOL.OUT" dx1="160.0"/>
-          <Connection Comment="" Destination="BOOL2BOOL_1.IN" Source="F_AND_1_1.OUT" dx1="200.0"/>
-          <Connection Comment="" Destination="F_OR.IN2" Source="BOOL2BOOL_1.OUT" dx1="190.0"/>
-          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem" dx1="3270.0"/>
-        </DataConnections>
         <EventConnections>
           <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer.E1" dx1="3730.0"/>
           <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer.E7" dx1="3730.0"/>
@@ -2618,7 +4971,7 @@
           <Connection Comment="" Destination="F_AND.REQ" Source="F_EQ_1_1_1.CNF" dx1="355.0"/>
           <Connection Comment="" Destination="BothServicesNotRegistered.REQ" Source="F_AND.CNF" dx1="370.0"/>
           <Connection Comment="" Destination="E_MERGE.EI1" Source="BothServicesRegistered.CNF" dx1="365.0"/>
-          <Connection Comment="" Destination="E_MERGE.EI2" Source="BothServicesNotRegistered.CNF" dx1="435.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI2" Source="BothServicesNotRegistered.CNF" dx1="390.0"/>
           <Connection Comment="" Destination="E_MERGE.EI2" Source="Service1NotRegisteredPos1.CNF" dx1="930.0"/>
           <Connection Comment="" Destination="E_MERGE.EI2" Source="Service2NotRegisteredPos1.CNF" dx1="895.0"/>
           <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="60.0" dx2="60.0" dy="-1200.0"/>
@@ -2628,7 +4981,7 @@
           <Connection Comment="" Destination="E_MERGE_1.EI2" Source="RegisterService2.doneUnregister" dx1="840.0"/>
           <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="60.0" dx2="60.0" dy="435.0"/>
           <Connection Comment="" Destination="F_AND_1.REQ" Source="F_EQ_2_1.CNF" dx1="280.0"/>
-          <Connection Comment="" Destination="BothServicesRegistered.REQ" Source="F_OR.CNF" dx1="60.0" dx2="60.0" dy="-50.0"/>
+          <Connection Comment="" Destination="BothServicesRegistered.REQ" Source="F_OR.CNF" dx1="65.0"/>
           <Connection Comment="" Destination="F_AND_1_1.REQ" Source="F_EQ_2.CNF" dx1="270.0"/>
           <Connection Comment="" Destination="BOOL2BOOL.REQ" Source="F_AND_1.CNF" dx1="235.0"/>
           <Connection Comment="" Destination="F_EQ_3.REQ" Source="BOOL2BOOL.CNF" dx1="60.0" dx2="60.0" dy="465.0"/>
@@ -2639,9 +4992,46 @@
           <Connection Comment="" Destination="Sequencer.Next" Source="Service1.CNF" dx1="60.0" dx2="60.0" dy="635.0"/>
           <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToArrowheadSystem_1.CNF" dx1="60.0" dx2="60.0" dy="520.0"/>
           <Connection Comment="" Destination="FieldsToArrowheadSystem_1.REQ" Source="SUBL_0.IND" dx1="1445.0"/>
-          <Connection Comment="" Destination="PUBL_0.INIT" Source="Sequencer.E10" dx1="450.0"/>
-          <Connection Comment="" Destination="PUBL_0.REQ" Source="PUBL_0.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="2050.0"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E10" dx1="435.0"/>
         </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="3290.0"/>
+          <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService" dx1="3270.0"/>
+          <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="3245.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="Service1.arrowheadService" dx1="615.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="625.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="630.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="570.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="570.0"/>
+          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4395.0"/>
+          <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4440.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4850.0"/>
+          <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="F_EQ_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4385.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4430.0"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4805.0"/>
+          <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="450.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4810.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4775.0"/>
+          <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4815.0"/>
+          <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_4.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4780.0"/>
+          <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ_4_1.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="F_AND.IN1" Source="F_EQ_1_1.OUT" dx1="355.0"/>
+          <Connection Comment="" Destination="F_AND.IN2" Source="F_EQ_1_1_1.OUT" dx1="355.0"/>
+          <Connection Comment="" Destination="BothServicesNotRegistered.check" Source="F_AND.OUT" dx1="370.0"/>
+          <Connection Comment="" Destination="F_AND_1.IN1" Source="F_EQ_3_1.OUT" dx1="270.0"/>
+          <Connection Comment="" Destination="F_AND_1.IN2" Source="F_EQ_2_1.OUT" dx1="280.0"/>
+          <Connection Comment="" Destination="BothServicesRegistered.check" Source="F_OR.OUT" dx1="65.0"/>
+          <Connection Comment="" Destination="F_AND_1_1.IN1" Source="F_EQ_3.OUT" dx1="255.0"/>
+          <Connection Comment="" Destination="F_AND_1_1.IN2" Source="F_EQ_2.OUT" dx1="270.0"/>
+          <Connection Comment="" Destination="BOOL2BOOL.IN" Source="F_AND_1.OUT" dx1="235.0"/>
+          <Connection Comment="" Destination="F_OR.IN1" Source="BOOL2BOOL.OUT" dx1="160.0"/>
+          <Connection Comment="" Destination="BOOL2BOOL_1.IN" Source="F_AND_1_1.OUT" dx1="200.0"/>
+          <Connection Comment="" Destination="F_OR.IN2" Source="BOOL2BOOL_1.OUT" dx1="190.0"/>
+          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem" dx1="3270.0"/>
+        </DataConnections>
       </FBNetwork>
     </Resource>
     <Resource Comment="" Name="VersionInterfaceAndMetadata" Type="EMB_RES" x="0.0" y="0.0">
@@ -2822,53 +5212,6 @@
         <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="7000.0" y="220.0">
           <Parameter Name="ID" Value="%versionEnded%"/>
         </FB>
-        <DataConnections>
-          <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="FieldsToArrowheadService.arrowheadService" dx1="450.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="470.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="295.0"/>
-          <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="730.0"/>
-          <Connection Comment="" Destination="LowerVersion.check" Source="F_EQ_4.OUT"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub_1.service" Source="FieldsToArrowheadService_1.arrowheadService" dx1="450.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub_1.serviceEntries" dx1="470.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="295.0"/>
-          <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="690.0"/>
-          <Connection Comment="" Destination="SameVersion.check" Source="F_EQ_4_1.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="F_EQ_4_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="655.0"/>
-          <Connection Comment="" Destination="OneInterfaceOutOfTwo.check" Source="F_EQ_4_1_1.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub_1_1.service" Source="FieldsToArrowheadService_1_1.arrowheadService" dx1="450.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_1.serviceEntries" dx1="470.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="260.0"/>
-          <Connection Comment="" Destination="F_EQ_4_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2.endpoint" dx1="655.0"/>
-          <Connection Comment="" Destination="OneInterfaceOutOfTwo_2.check" Source="F_EQ_4_1_2.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2.service" Source="FieldsToArrowheadService_1_2.arrowheadService" dx1="450.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2.serviceEntries" dx1="470.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2.OUT" dx1="260.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1.serviceEntries" dx1="470.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1.OUT" dx1="220.0"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1.service" Source="FieldsToArrowheadService_1_2_1.arrowheadService" dx1="450.0"/>
-          <Connection Comment="" Destination="F_EQ_4_1_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1.endpoint" dx1="615.0"/>
-          <Connection Comment="" Destination="WrongInterfaceProvided.check" Source="F_EQ_4_1_2_1.OUT" dx1="385.0"/>
-          <Connection Comment="" Destination="F_EQ_4_1_2_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1.endpoint" dx1="580.0"/>
-          <Connection Comment="" Destination="OnlyOneMetadata.check" Source="F_EQ_4_1_2_1_1.OUT" dx1="345.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1.OUT" dx1="185.0"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1.service" Source="FieldsToArrowheadService_1_2_1_1.arrowheadService" dx1="450.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1.serviceEntries" dx1="440.0"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1.arrowheadService" dx1="430.0"/>
-          <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.endpoint" dx1="540.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1.serviceEntries" dx1="405.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1.OUT" dx1="145.0"/>
-          <Connection Comment="" Destination="NoMetadataAndAsked.check" Source="F_EQ_4_1_2_1_1_1.OUT" dx1="310.0"/>
-          <Connection Comment="" Destination="F_EQ_4_1_2_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.endpoint"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_2.OUT"/>
-          <Connection Comment="" Destination="NoInterfaceProvided.check" Source="F_EQ_4_1_2_1_2.OUT"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.service" Source="FieldsToArrowheadService_1_2_1_2.arrowheadService"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_2.serviceEntries"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1_1.arrowheadService"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1_1.serviceEntries"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1_1.OUT"/>
-          <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.endpoint"/>
-          <Connection Comment="" Destination="WrongMetadaButNotAsked.check" Source="F_EQ_4_1_2_1_1_1_1.OUT"/>
-        </DataConnections>
         <EventConnections>
           <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="FieldsToArrowheadService.CNF" dx1="450.0"/>
           <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryServiceHTTPSub.CNF" dx1="470.0"/>
@@ -2903,34 +5246,81 @@
           <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1.CNF" dx1="430.0"/>
           <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.CNF" dx1="540.0"/>
           <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1.CNF" dx1="405.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1.CNF" dx1="145.0"/>
-          <Connection Comment="" Destination="NoMetadataAndAsked.REQ" Source="F_EQ_4_1_2_1_1_1.CNF"/>
-          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="75.0"/>
-          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="75.0"/>
-          <Connection Comment="" Destination="F_EQ_4_1_2_1_2.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.CNF"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.REQ" Source="GET_AT_INDEX_1_2_1_2.CNF"/>
-          <Connection Comment="" Destination="NoInterfaceProvided.REQ" Source="F_EQ_4_1_2_1_2.CNF"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.REQ" Source="FieldsToArrowheadService_1_2_1_2.CNF"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.REQ" Source="QueryServiceHTTPSub_1_2_1_2.CNF"/>
-          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1_1.CNF"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1_1.CNF"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1_1.CNF"/>
-          <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.CNF"/>
-          <Connection Comment="" Destination="WrongMetadaButNotAsked.REQ" Source="F_EQ_4_1_2_1_1_1_1.CNF"/>
-          <Connection Comment="" Destination="RegisterServiceFullHTTP.register" Source="SUBL_0.IND"/>
-          <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="RegisterServiceFullHTTP.doneRegister"/>
-          <Connection Comment="" Destination="FieldsToArrowheadService_1.REQ" Source="LowerVersion.CNF"/>
-          <Connection Comment="" Destination="FieldsToArrowheadService_1_1.REQ" Source="SameVersion.CNF"/>
-          <Connection Comment="" Destination="FieldsToArrowheadService_1_2.REQ" Source="OneInterfaceOutOfTwo.CNF"/>
-          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_2.REQ" Source="OneInterfaceOutOfTwo_2.CNF"/>
-          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1.REQ" Source="NoInterfaceProvided.CNF"/>
-          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1.REQ" Source="WrongInterfaceProvided.CNF"/>
-          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1.REQ" Source="OnlyOneMetadata.CNF"/>
-          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1_1.REQ" Source="NoMetadataAndAsked.CNF"/>
-          <Connection Comment="" Destination="RegisterServiceFullHTTP.unregister" Source="WrongMetadaButNotAsked.CNF"/>
-          <Connection Comment="" Destination="PUBL_0.INIT" Source="RegisterServiceFullHTTP.doneUnregister"/>
-          <Connection Comment="" Destination="PUBL_0.REQ" Source="PUBL_0.INITO"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1.CNF" dx1="140.0"/>
+          <Connection Comment="" Destination="NoMetadataAndAsked.REQ" Source="F_EQ_4_1_2_1_1_1.CNF" dx1="255.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="60.0" dx2="60.0" dy="115.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="60.0" dx2="60.0" dy="65.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_2.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.CNF" dx1="440.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.REQ" Source="GET_AT_INDEX_1_2_1_2.CNF" dx1="145.0"/>
+          <Connection Comment="" Destination="NoInterfaceProvided.REQ" Source="F_EQ_4_1_2_1_2.CNF" dx1="300.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.REQ" Source="FieldsToArrowheadService_1_2_1_2.CNF" dx1="285.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.REQ" Source="QueryServiceHTTPSub_1_2_1_2.CNF" dx1="325.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1_1.CNF" dx1="265.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1_1.CNF" dx1="285.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1_1.CNF" dx1="60.0" dx2="60.0" dy="20.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.CNF" dx1="350.0"/>
+          <Connection Comment="" Destination="WrongMetadaButNotAsked.REQ" Source="F_EQ_4_1_2_1_1_1_1.CNF" dx1="210.0"/>
+          <Connection Comment="" Destination="RegisterServiceFullHTTP.register" Source="SUBL_0.IND" dx1="1965.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="RegisterServiceFullHTTP.doneRegister" dx1="60.0" dx2="60.0" dy="1200.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1.REQ" Source="LowerVersion.CNF" dx1="60.0" dx2="60.0" dy="670.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_1.REQ" Source="SameVersion.CNF" dx1="60.0" dx2="60.0" dy="770.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2.REQ" Source="OneInterfaceOutOfTwo.CNF" dx1="60.0" dx2="60.0" dy="725.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_2.REQ" Source="OneInterfaceOutOfTwo_2.CNF" dx1="60.0" dx2="60.0" dy="805.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1.REQ" Source="NoInterfaceProvided.CNF" dx1="60.0" dx2="60.0" dy="-115.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1.REQ" Source="WrongInterfaceProvided.CNF" dx1="60.0" dx2="60.0" dy="720.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1.REQ" Source="OnlyOneMetadata.CNF" dx1="60.0" dx2="60.0" dy="720.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1_1.REQ" Source="NoMetadataAndAsked.CNF" dx1="60.0" dx2="60.0" dy="1745.0"/>
+          <Connection Comment="" Destination="RegisterServiceFullHTTP.unregister" Source="WrongMetadaButNotAsked.CNF" dx1="60.0" dx2="60.0" dy="-6970.0"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="2895.0"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="RegisterServiceFullHTTP.doneUnregister" dx1="340.0"/>
         </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="FieldsToArrowheadService.arrowheadService" dx1="450.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="470.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="295.0"/>
+          <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="730.0"/>
+          <Connection Comment="" Destination="LowerVersion.check" Source="F_EQ_4.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1.service" Source="FieldsToArrowheadService_1.arrowheadService" dx1="450.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub_1.serviceEntries" dx1="470.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="295.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="690.0"/>
+          <Connection Comment="" Destination="SameVersion.check" Source="F_EQ_4_1.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="655.0"/>
+          <Connection Comment="" Destination="OneInterfaceOutOfTwo.check" Source="F_EQ_4_1_1.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_1.service" Source="FieldsToArrowheadService_1_1.arrowheadService" dx1="450.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_1.serviceEntries" dx1="470.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="260.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2.endpoint" dx1="655.0"/>
+          <Connection Comment="" Destination="OneInterfaceOutOfTwo_2.check" Source="F_EQ_4_1_2.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2.service" Source="FieldsToArrowheadService_1_2.arrowheadService" dx1="450.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2.serviceEntries" dx1="470.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2.OUT" dx1="260.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1.serviceEntries" dx1="470.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1.OUT" dx1="220.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1.service" Source="FieldsToArrowheadService_1_2_1.arrowheadService" dx1="450.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1.endpoint" dx1="615.0"/>
+          <Connection Comment="" Destination="WrongInterfaceProvided.check" Source="F_EQ_4_1_2_1.OUT" dx1="385.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1.endpoint" dx1="580.0"/>
+          <Connection Comment="" Destination="OnlyOneMetadata.check" Source="F_EQ_4_1_2_1_1.OUT" dx1="345.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1.OUT" dx1="185.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1.service" Source="FieldsToArrowheadService_1_2_1_1.arrowheadService" dx1="450.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1.serviceEntries" dx1="440.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1.arrowheadService" dx1="430.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.endpoint" dx1="540.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1.serviceEntries" dx1="405.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1.OUT" dx1="140.0"/>
+          <Connection Comment="" Destination="NoMetadataAndAsked.check" Source="F_EQ_4_1_2_1_1_1.OUT" dx1="310.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.endpoint" dx1="440.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_2.OUT" dx1="145.0"/>
+          <Connection Comment="" Destination="NoInterfaceProvided.check" Source="F_EQ_4_1_2_1_2.OUT" dx1="300.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.service" Source="FieldsToArrowheadService_1_2_1_2.arrowheadService" dx1="285.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_2.serviceEntries" dx1="325.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1_1.arrowheadService" dx1="265.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1_1.serviceEntries" dx1="285.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1_1.OUT" dx1="60.0" dx2="60.0" dy="-30.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.endpoint" dx1="350.0"/>
+          <Connection Comment="" Destination="WrongMetadaButNotAsked.check" Source="F_EQ_4_1_2_1_1_1_1.OUT" dx1="210.0"/>
+        </DataConnections>
       </FBNetwork>
     </Resource>
     <Resource Comment="" Name="RegisterMoreServicesSubApp" Type="EMB_RES" x="0.0" y="0.0">
@@ -2999,7 +5389,7 @@
         <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="9080.0" y="7590.0">
           <Parameter Name="ID" Value="%test6Ended%"/>
         </FB>
-        <SubApp Comment="" Name="QuerySecondService" Type="QueryServiceHTTPSubFull" x="8800.0" y="11670.0">
+        <SubApp Comment="" Name="QuerySecondService" Type="QueryServiceHTTPSubFull" x="8000.0" y="11400.0">
           <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
           <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
           <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
@@ -3043,6 +5433,54 @@
           <Parameter Name="metadata" Value="%metadata%"/>
           <Parameter Name="SREndpoint" Value="%serviceRegistryAddress%"/>
         </SubApp>
+        <EventConnections>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="135.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="135.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="575.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="460.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToArrowheadSystem.CNF" dx1="1030.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="535.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_2.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="GET_AT_INDEX_2.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
+          <Connection Comment="" Destination="Pos0Service1.REQ" Source="F_EQ_2.CNF" dx1="390.0"/>
+          <Connection Comment="" Destination="Pos1Empty.REQ" Source="Pos0Service1.CNF" dx1="60.0" dx2="60.0" dy="310.0"/>
+          <Connection Comment="" Destination="F_EQ_3.REQ" Source="Sequencer.E2" dx1="7145.0"/>
+          <Connection Comment="" Destination="F_EQ_2.REQ" Source="F_EQ_3.CNF" dx1="60.0" dx2="60.0" dy="315.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="Sequencer.E4" dx1="7095.0"/>
+          <Connection Comment="" Destination="F_EQ_1.REQ" Source="F_EQ_3_1.CNF" dx1="60.0" dx2="60.0" dy="395.0"/>
+          <Connection Comment="" Destination="Pos0Service2.REQ" Source="F_EQ_1.CNF" dx1="430.0"/>
+          <Connection Comment="" Destination="Pos1Empty2.REQ" Source="Pos0Service2.CNF" dx1="60.0" dx2="60.0" dy="410.0"/>
+          <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E3" dx1="1435.0"/>
+          <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E8" dx1="1435.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_2.REQ" Source="QuerySecondService.CNF" dx1="940.0"/>
+          <Connection Comment="" Destination="QueryFirstService.REQ" Source="Sequencer.E1" dx1="1395.0"/>
+          <Connection Comment="" Destination="QueryFirstService.REQ" Source="Sequencer.E6" dx1="1395.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryFirstService.CNF" dx1="975.0"/>
+          <Connection Comment="" Destination="Pos1Empty3.REQ" Source="F_EQ_1_1.CNF" dx1="445.0"/>
+          <Connection Comment="" Destination="Pos0Empty3.REQ" Source="F_EQ_3_1_1.CNF" dx1="420.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Pos0Empty3.CNF" dx1="60.0" dx2="60.0" dy="385.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1_1.REQ" Source="Pos0Empty4.CNF" dx1="60.0" dx2="60.0" dy="385.0"/>
+          <Connection Comment="" Destination="Pos1Empty4.REQ" Source="F_EQ_1_1_1.CNF" dx1="445.0"/>
+          <Connection Comment="" Destination="Pos0Empty4.REQ" Source="F_EQ_3_1_1_1.CNF" dx1="385.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty.CNF" dx1="210.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty2.CNF" dx1="290.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty3.CNF" dx1="330.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty4.CNF" dx1="360.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="60.0" dx2="60.0" dy="-2580.0"/>
+          <Connection Comment="" Destination="E_MERGE_1.EI1" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="205.0"/>
+          <Connection Comment="" Destination="E_MERGE_1.EI2" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="135.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="60.0" dx2="60.0" dy="-1425.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1_1.REQ" Source="Sequencer.E7" dx1="7045.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1_1_1.REQ" Source="Sequencer.E9" dx1="7015.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.registerDone" dx1="60.0" dx2="60.0" dy="1970.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.unregisterUndone" dx1="60.0" dx2="60.0" dy="1920.0"/>
+          <Connection Comment="" Destination="RegisterManyServices.unregister" Source="Sequencer.E5" dx1="250.0"/>
+          <Connection Comment="" Destination="RegisterManyServices.register" Source="Sequencer.E0" dx1="250.0"/>
+          <Connection Comment="" Destination="PUBL_0_1.REQ" Source="Sequencer.E10"/>
+          <Connection Comment="" Destination="PUBL_0_1.INIT" Source="SUBL_0.INITO"/>
+        </EventConnections>
         <DataConnections>
           <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="570.0"/>
           <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2675.0"/>
@@ -3065,59 +5503,11 @@
           <Connection Comment="" Destination="Pos1Empty4.check" Source="F_EQ_1_1_1.OUT" dx1="445.0"/>
           <Connection Comment="" Destination="Pos0Empty4.check" Source="F_EQ_3_1_1_1.OUT" dx1="385.0"/>
           <Connection Comment="" Destination="RegisterManyServices.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="1490.0"/>
-          <Connection Comment="" Destination="F_EQ_3_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint"/>
-          <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint"/>
-          <Connection Comment="" Destination="F_EQ_3_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint"/>
-          <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint"/>
+          <Connection Comment="" Destination="F_EQ_3_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2420.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2410.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="2385.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="2345.0"/>
         </DataConnections>
-        <EventConnections>
-          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="135.0"/>
-          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="135.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="575.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
-          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="460.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
-          <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToArrowheadSystem.CNF" dx1="1030.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="535.0"/>
-          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_2.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="GET_AT_INDEX_2.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
-          <Connection Comment="" Destination="Pos0Service1.REQ" Source="F_EQ_2.CNF" dx1="390.0"/>
-          <Connection Comment="" Destination="Pos1Empty.REQ" Source="Pos0Service1.CNF" dx1="60.0" dx2="60.0" dy="310.0"/>
-          <Connection Comment="" Destination="F_EQ_3.REQ" Source="Sequencer.E2" dx1="7145.0"/>
-          <Connection Comment="" Destination="F_EQ_2.REQ" Source="F_EQ_3.CNF" dx1="60.0" dx2="60.0" dy="315.0"/>
-          <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="Sequencer.E4" dx1="7095.0"/>
-          <Connection Comment="" Destination="F_EQ_1.REQ" Source="F_EQ_3_1.CNF" dx1="60.0" dx2="60.0" dy="395.0"/>
-          <Connection Comment="" Destination="Pos0Service2.REQ" Source="F_EQ_1.CNF" dx1="430.0"/>
-          <Connection Comment="" Destination="Pos1Empty2.REQ" Source="Pos0Service2.CNF" dx1="60.0" dx2="60.0" dy="410.0"/>
-          <Connection Comment="" Destination="PUBL_0_1.INIT" Source="Sequencer.E10" dx1="1575.0"/>
-          <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E3" dx1="1435.0"/>
-          <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E8" dx1="1435.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX_2.REQ" Source="QuerySecondService.CNF" dx1="940.0"/>
-          <Connection Comment="" Destination="QueryFirstService.REQ" Source="Sequencer.E1" dx1="1395.0"/>
-          <Connection Comment="" Destination="QueryFirstService.REQ" Source="Sequencer.E6" dx1="1395.0"/>
-          <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryFirstService.CNF" dx1="975.0"/>
-          <Connection Comment="" Destination="Pos1Empty3.REQ" Source="F_EQ_1_1.CNF" dx1="445.0"/>
-          <Connection Comment="" Destination="Pos0Empty3.REQ" Source="F_EQ_3_1_1.CNF" dx1="420.0"/>
-          <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Pos0Empty3.CNF" dx1="60.0" dx2="60.0" dy="385.0"/>
-          <Connection Comment="" Destination="F_EQ_1_1_1.REQ" Source="Pos0Empty4.CNF" dx1="60.0" dx2="60.0" dy="385.0"/>
-          <Connection Comment="" Destination="Pos1Empty4.REQ" Source="F_EQ_1_1_1.CNF" dx1="445.0"/>
-          <Connection Comment="" Destination="Pos0Empty4.REQ" Source="F_EQ_3_1_1_1.CNF" dx1="385.0"/>
-          <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty.CNF" dx1="210.0"/>
-          <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty2.CNF" dx1="290.0"/>
-          <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty3.CNF" dx1="330.0"/>
-          <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty4.CNF" dx1="360.0"/>
-          <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="60.0" dx2="60.0" dy="-2580.0"/>
-          <Connection Comment="" Destination="E_MERGE_1.EI1" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="265.0"/>
-          <Connection Comment="" Destination="E_MERGE_1.EI2" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="220.0"/>
-          <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="60.0" dx2="60.0" dy="-1425.0"/>
-          <Connection Comment="" Destination="PUBL_0_1.REQ" Source="PUBL_0_1.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
-          <Connection Comment="" Destination="F_EQ_3_1_1.REQ" Source="Sequencer.E7"/>
-          <Connection Comment="" Destination="F_EQ_3_1_1_1.REQ" Source="Sequencer.E9"/>
-          <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.registerDone"/>
-          <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.unregisterUndone"/>
-          <Connection Comment="" Destination="RegisterManyServices.unregister" Source="Sequencer.E5"/>
-          <Connection Comment="" Destination="RegisterManyServices.register" Source="Sequencer.E0"/>
-        </EventConnections>
       </FBNetwork>
     </Resource>
     <Resource Comment="" Name="OrchestratorNoRule" Type="EMB_RES" x="0.0" y="0.0">
@@ -3183,18 +5573,6 @@
         <FB Comment="" Name="RequestOrchestrationForm" Type="RequestOrchestrationForm" x="11680.0" y="1805.0">
           <Parameter Name="endpoint" Value="%orchestratorAddress%"/>
         </FB>
-        <DataConnections>
-          <Connection Comment="" Destination="FieldsToServiceRequestForm.requesterSystem" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="550.0"/>
-          <Connection Comment="" Destination="FieldsToServiceRequestForm.requestedService" Source="Service1.arrowheadService" dx1="580.0"/>
-          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationForm.endpoint" dx1="370.0"/>
-          <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="SERVER_1.QI" Source="E_SR.Q" dx1="220.0"/>
-          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="650.0"/>
-          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="620.0"/>
-          <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.orchestrationForm" Source="GET_STRUCT_VALUE1.OUT" dx1="210.0"/>
-          <Connection Comment="" Destination="RequestOrchestrationForm.serviceRequestForm" Source="FieldsToServiceRequestForm.serviceRequestForm"/>
-          <Connection Comment="" Destination="GET_STRUCT_VALUE1.IN_ARRAY" Source="RequestOrchestrationForm.orchestrationResponse"/>
-        </DataConnections>
         <EventConnections>
           <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="650.0"/>
           <Connection Comment="" Destination="FieldsToServiceRequestForm.REQ" Source="Service1.CNF" dx1="580.0"/>
@@ -3202,7 +5580,6 @@
           <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF" dx1="420.0"/>
           <Connection Comment="" Destination="SERVER_1.INIT" Source="E_SR.EO" dx1="220.0"/>
           <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="1045.0"/>
-          <Connection Comment="" Destination="PUBL_0.REQ" Source="PUBL_0.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
           <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="1790.0"/>
           <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.REQ" Source="GET_STRUCT_VALUE1.CNF" dx1="210.0"/>
           <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer_1.E1" dx1="4305.0"/>
@@ -3211,7 +5588,6 @@
           <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E7" dx1="670.0"/>
           <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer_1.E8" dx1="4305.0"/>
           <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E10" dx1="670.0"/>
-          <Connection Comment="" Destination="PUBL_0.INIT" Source="Sequencer_1.E11" dx1="1710.0"/>
           <Connection Comment="" Destination="Sequencer_1.Next" Source="NoServiceAvailable.CNF" dx1="60.0" dx2="60.0" dy="675.0"/>
           <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneUnregister" dx1="60.0" dx2="60.0" dy="55.0"/>
           <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneRegister" dx1="60.0" dx2="60.0" dy="105.0"/>
@@ -3224,7 +5600,21 @@
           <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E6"/>
           <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E9"/>
           <Connection Comment="" Destination="GET_STRUCT_VALUE1.REQ" Source="RequestOrchestrationForm.responseReceived"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1.E11"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO"/>
         </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="FieldsToServiceRequestForm.requesterSystem" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="550.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRequestForm.requestedService" Source="Service1.arrowheadService" dx1="580.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationForm.endpoint" dx1="370.0"/>
+          <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="SERVER_1.QI" Source="E_SR.Q" dx1="220.0"/>
+          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="650.0"/>
+          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="620.0"/>
+          <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.orchestrationForm" Source="GET_STRUCT_VALUE1.OUT" dx1="210.0"/>
+          <Connection Comment="" Destination="RequestOrchestrationForm.serviceRequestForm" Source="FieldsToServiceRequestForm.serviceRequestForm"/>
+          <Connection Comment="" Destination="GET_STRUCT_VALUE1.IN_ARRAY" Source="RequestOrchestrationForm.orchestrationResponse"/>
+        </DataConnections>
         <AdapterConnections>
           <Connection Comment="" Destination="RequestOrchestrationHTTP.requestOrchestration" Source="RequestOrchestrationForm.requestOrchestration"/>
         </AdapterConnections>
@@ -3261,7 +5651,7 @@
           <Parameter Name="ID" Value="%test7Ended%"/>
         </FB>
         <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="4830.0" y="7615.0">
-          <Parameter Name="ID" Value="%allEnded%"/>
+          <Parameter Name="ID" Value="%test8Ended%"/>
         </FB>
         <SubApp Comment="" Name="Sequencer_1" x="985.0" y="4510.0">
           <SubAppInterfaceList>
@@ -3305,10 +5695,7 @@
           <Parameter Name="SD_1" Value="STRING#%orchRuleData%"/>
         </FB>
         <FB Comment="" Name="STRING2STRING" Type="STRING2STRING" x="11510.0" y="6950.0"/>
-        <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="6165.0" y="320.0">
-          <Parameter Name="ID" Value="%allLoaded%"/>
-        </FB>
-        <SubApp Comment="" Name="GetEndpointFromOrchestrationHTTPPFull" Type="GetEndpointFromOrchestrationHTTPPFull" x="14890.0" y="4470.0">
+        <SubApp Comment="" Name="GetEndpointFromOrchestrationHTTPPFull" Type="GetEndpointFromOrchestrationHTTPPFull" x="12900.0" y="2900.0">
           <Parameter Name="systemName" Value="%systemName%"/>
           <Parameter Name="address" Value="%testAddress%"/>
           <Parameter Name="port" Value="%systemPort%"/>
@@ -3318,24 +5705,11 @@
           <Parameter Name="orchestratorEndpoint" Value="%orchestratorAddress%"/>
           <Parameter Name="INDEX" Value="0"/>
         </SubApp>
-        <DataConnections>
-          <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="SERVER_1.QI" Source="E_SR.Q" dx1="220.0"/>
-          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="650.0"/>
-          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="620.0"/>
-          <Connection Comment="" Destination="ServiceAvailable.check" Source="F_EQ_1.OUT" dx1="420.0"/>
-          <Connection Comment="" Destination="E_SWITCH.G" Source="E_SR_1.Q" dx1="380.0"/>
-          <Connection Comment="" Destination="STRING2STRING.IN" Source="SERVER_1.RD_1" dx1="110.0"/>
-          <Connection Comment="" Destination="SERVER_1.SD_1" Source="STRING2STRING.OUT" dx1="60.0" dx2="60.0" dy="-130.0"/>
-          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint"/>
-          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint"/>
-        </DataConnections>
         <EventConnections>
           <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="650.0"/>
-          <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF" dx1="420.0"/>
+          <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF" dx1="430.0"/>
           <Connection Comment="" Destination="SERVER_1.INIT" Source="E_SR.EO" dx1="220.0"/>
           <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="1045.0"/>
-          <Connection Comment="" Destination="PUBL_0.REQ" Source="PUBL_0.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
           <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneUnregister" dx1="60.0" dx2="60.0" dy="55.0"/>
           <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneRegister" dx1="60.0" dx2="60.0" dy="105.0"/>
           <Connection Comment="" Destination="Sequencer_1.Next" Source="NoServiceAvailable.CNF" dx1="60.0" dx2="60.0" dy="700.0"/>
@@ -3350,27 +5724,1811 @@
           <Connection Comment="" Destination="CLIENT_1_2_1.INIT" Source="CLIENT_1_2.CNF" dx1="1120.0"/>
           <Connection Comment="" Destination="CLIENT_1_2_1.REQ" Source="CLIENT_1_2_1.INITO" dx1="60.0" dx2="60.0" dy="50.0"/>
           <Connection Comment="" Destination="CLIENT_1_2.INIT" Source="Sequencer_1.E0" dx1="6305.0"/>
-          <Connection Comment="" Destination="Sequencer_1.Next" Source="CLIENT_1_2_1.CNF" dx1="60.0" dx2="60.0" dy="1910.0"/>
           <Connection Comment="" Destination="STRING2STRING.REQ" Source="SERVER_1.IND" dx1="110.0"/>
           <Connection Comment="" Destination="SERVER_1.RSP" Source="STRING2STRING.CNF" dx1="60.0" dx2="60.0" dy="-230.0"/>
-          <Connection Comment="" Destination="Sequencer_1.Next" Source="ServiceAvailable.CNF" dx1="60.0" dx2="60.0" dy="215.0"/>
           <Connection Comment="" Destination="E_SR_1.S" Source="Sequencer_1.E3" dx1="7855.0"/>
           <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E5" dx1="4330.0"/>
           <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer_1.E7" dx1="4305.0"/>
           <Connection Comment="" Destination="E_SR_1.R" Source="Sequencer_1.E8" dx1="7855.0"/>
           <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E10" dx1="4330.0"/>
-          <Connection Comment="" Destination="PUBL_0.INIT" Source="Sequencer_1.E12" dx1="1710.0"/>
           <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="2205.0"/>
           <Connection Comment="" Destination="Sequencer_1.Next" Source="Service1.CNF" dx1="60.0" dx2="60.0" dy="1055.0"/>
+          <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E11" dx1="5710.0"/>
+          <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E9" dx1="5710.0"/>
+          <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E6" dx1="5710.0"/>
+          <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E4" dx1="5710.0"/>
+          <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E1" dx1="5710.0"/>
+          <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromOrchestrationHTTPPFull.CNF" dx1="1730.0"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="CLIENT_1_2_1.CNF" dx1="60.0" dx2="60.0" dy="1910.0"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="ServiceAvailable.CNF"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1.E12"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="SERVER_1.QI" Source="E_SR.Q" dx1="220.0"/>
+          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="650.0"/>
+          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="620.0"/>
+          <Connection Comment="" Destination="ServiceAvailable.check" Source="F_EQ_1.OUT" dx1="420.0"/>
+          <Connection Comment="" Destination="E_SWITCH.G" Source="E_SR_1.Q" dx1="380.0"/>
+          <Connection Comment="" Destination="STRING2STRING.IN" Source="SERVER_1.RD_1" dx1="110.0"/>
+          <Connection Comment="" Destination="SERVER_1.SD_1" Source="STRING2STRING.OUT" dx1="60.0" dx2="60.0" dy="-130.0"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint" dx1="2450.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint" dx1="2470.0"/>
+        </DataConnections>
+      </FBNetwork>
+    </Resource>
+    <Resource Comment="" Name="PublishSubscribe" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="900.0" y="500.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToPublishEvent" Type="FieldsToPublishEvent" x="3600.0" y="1200.0"/>
+        <FB Comment="" Name="ArrowheadPublish" Type="ArrowheadPublish" x="6600.0" y="1300.0">
+          <Parameter Name="endpoint" Value="%eventHandlerAddress%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadEvent" Type="FieldsToArrowheadEvent" x="800.0" y="1900.0">
+          <Parameter Name="type" Value="%eventType%"/>
+          <Parameter Name="payload" Value="%eventPayload%"/>
+          <Parameter Name="eventMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="SubscribeEvent" Type="SubscribeEvent" x="6335.0" y="3265.0">
+          <Parameter Name="endpoint" Value="%eventHandlerAddress%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToEventFilter" Type="FieldsToEventFilter" x="3800.0" y="3300.0">
+          <Parameter Name="eventType" Value="%eventType%"/>
+          <Parameter Name="filterMetadata" Value="%serviceMetadata%"/>
+          <Parameter Name="notifyUri" Value="WSTRING#/subscribePath"/>
+          <Parameter Name="matchMetadata" Value="BOOL#TRUE"/>
+        </FB>
+        <FB Comment="" Name="E_CTU" Type="E_CTU" x="1340.0" y="6655.0"/>
+        <FB Comment="" Name="F_EQ" Type="F_EQ" x="12700.0" y="7200.0">
+          <Parameter Name="IN2" Value="UINT#0"/>
+        </FB>
+        <FB Comment="" Name="E_DELAY" Type="E_DELAY" x="10900.0" y="6800.0">
+          <Parameter Name="DT" Value="T#2s"/>
+        </FB>
+        <FB Comment="" Name="NoMessage" Type="TEST_CONDITION" x="13600.0" y="7200.0"/>
+        <FB Comment="" Name="E_DELAY_1" Type="E_DELAY" x="10900.0" y="7800.0">
+          <Parameter Name="DT" Value="T#2s"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="12700.0" y="8200.0">
+          <Parameter Name="IN2" Value="UINT#1"/>
+        </FB>
+        <FB Comment="" Name="OneMessage" Type="TEST_CONDITION" x="13600.0" y="8200.0"/>
+        <FB Comment="" Name="E_DELAY_1_1" Type="E_DELAY" x="11000.0" y="9000.0">
+          <Parameter Name="DT" Value="T#2s"/>
+        </FB>
+        <FB Comment="" Name="TwoMessages" Type="TEST_CONDITION" x="13700.0" y="9400.0"/>
+        <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="12800.0" y="9400.0">
+          <Parameter Name="IN2" Value="UINT#2"/>
+        </FB>
+        <SubApp Comment="" Name="Sequencer_1_1" x="-700.0" y="600.0">
+          <SubAppInterfaceList>
+            <SubAppEventInputs>
+              <SubAppEvent Comment="" Name="Next" Type="Event"/>
+            </SubAppEventInputs>
+            <SubAppEventOutputs>
+              <SubAppEvent Comment="" Name="E0" Type="Event"/>
+              <SubAppEvent Comment="" Name="E1" Type="Event"/>
+              <SubAppEvent Comment="" Name="E2" Type="Event"/>
+              <SubAppEvent Comment="" Name="E3" Type="Event"/>
+              <SubAppEvent Comment="" Name="E4" Type="Event"/>
+              <SubAppEvent Comment="" Name="E5" Type="Event"/>
+              <SubAppEvent Comment="" Name="E6" Type="Event"/>
+              <SubAppEvent Comment="" Name="E7" Type="Event"/>
+              <SubAppEvent Comment="" Name="E8" Type="Event"/>
+              <SubAppEvent Comment="" Name="E9" Type="Event"/>
+              <SubAppEvent Comment="" Name="E10" Type="Event"/>
+              <SubAppEvent Comment="" Name="E11" Type="Event"/>
+              <SubAppEvent Comment="" Name="E12" Type="Event"/>
+              <SubAppEvent Comment="" Name="E13" Type="Event"/>
+              <SubAppEvent Comment="" Name="E14" Type="Event"/>
+              <SubAppEvent Comment="" Name="E15" Type="Event"/>
+            </SubAppEventOutputs>
+          </SubAppInterfaceList>
+        </SubApp>
+        <FB Comment="" Name="SERVER_1_0" Type="SERVER_1" x="35.0" y="6350.0">
+          <Parameter Name="QI" Value="1"/>
+          <Parameter Name="ID" Value="http[/subscribePath]"/>
+        </FB>
+        <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="-2500.0" y="-2500.0">
+          <Parameter Name="ID" Value="%allLoaded%"/>
+        </FB>
+        <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="-3695.0" y="-2025.0">
+          <Parameter Name="ID" Value="%test8Ended%"/>
+        </FB>
+        <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="1000.0" y="3800.0">
+          <Parameter Name="ID" Value="%allEnded%"/>
+        </FB>
+        <FB Comment="" Name="PublishEventHTTP" Type="PublishEventHTTP" x="14500.0" y="700.0"/>
+        <FB Comment="" Name="SubscribeEventHTTP" Type="SubscribeEventHTTP" x="14670.0" y="3640.0"/>
+        <EventConnections>
+          <Connection Comment="" Destination="ArrowheadPublish.publish" Source="FieldsToPublishEvent.CNF" dx1="755.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadEvent.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="700.0"/>
+          <Connection Comment="" Destination="F_EQ.REQ" Source="E_DELAY.EO" dx1="685.0"/>
+          <Connection Comment="" Destination="NoMessage.REQ" Source="F_EQ.CNF"/>
+          <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_DELAY_1.EO" dx1="685.0"/>
+          <Connection Comment="" Destination="OneMessage.REQ" Source="F_EQ_1.CNF"/>
+          <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="E_DELAY_1_1.EO" dx1="685.0"/>
+          <Connection Comment="" Destination="TwoMessages.REQ" Source="F_EQ_1_1.CNF"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="TwoMessages.CNF" dx1="60.0" dx2="60.0" dy="-4400.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="OneMessage.CNF" dx1="60.0" dx2="60.0" dy="-3800.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="NoMessage.CNF" dx1="60.0" dx2="60.0" dy="-3300.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="FieldsToEventFilter.CNF" dx1="60.0" dx2="60.0" dy="-1350.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="Sequencer_1_1.E0" dx1="575.0"/>
+          <Connection Comment="" Destination="FieldsToPublishEvent.REQ" Source="Sequencer_1_1.E1" dx1="1925.0"/>
+          <Connection Comment="" Destination="E_DELAY.START" Source="Sequencer_1_1.E2" dx1="5575.0"/>
+          <Connection Comment="" Destination="SubscribeEvent.Subscribe" Source="Sequencer_1_1.E3" dx1="3290.0"/>
+          <Connection Comment="" Destination="E_DELAY.START" Source="Sequencer_1_1.E4" dx1="5575.0"/>
+          <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E5" dx1="3425.0"/>
+          <Connection Comment="" Destination="E_DELAY_1.START" Source="Sequencer_1_1.E6" dx1="5575.0"/>
+          <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E7"/>
+          <Connection Comment="" Destination="E_DELAY_1_1.START" Source="Sequencer_1_1.E8" dx1="5625.0"/>
+          <Connection Comment="" Destination="SubscribeEvent.Unsubscribe" Source="Sequencer_1_1.E9" dx1="3290.0"/>
+          <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E10" dx1="3425.0"/>
+          <Connection Comment="" Destination="E_DELAY_1_1.START" Source="Sequencer_1_1.E11" dx1="5625.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="ArrowheadPublish.published" dx1="60.0" dx2="60.0" dy="-350.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SubscribeEvent.Subscribed" dx1="60.0" dx2="60.0" dy="-1330.0"/>
+          <Connection Comment="" Destination="SERVER_1_0.INIT" Source="FieldsToArrowheadEvent.CNF" dx1="60.0" dx2="60.0" dy="2225.0"/>
+          <Connection Comment="" Destination="SERVER_1_0.RSP" Source="E_CTU.CUO" dx1="60.0" dx2="60.0" dy="-100.0"/>
+          <Connection Comment="" Destination="FieldsToEventFilter.REQ" Source="SERVER_1_0.INITO" dx1="1610.0"/>
+          <Connection Comment="" Destination="E_CTU.CU" Source="SERVER_1_0.IND" dx1="380.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SubscribeEvent.Unsubscribed" dx1="60.0" dx2="60.0" dy="-1380.0"/>
+          <Connection Comment="" Destination="PUBL_0_1.INIT" Source="SUBL_0.INITO" dx1="345.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="290.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="290.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SUBL_0.IND" dx1="650.0"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="PUBL_0_1.INITO"/>
+          <Connection Comment="" Destination="PUBL_0_1.REQ" Source="PUBL_0.INITO"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1_1.E12"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="FieldsToPublishEvent.source" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="560.0"/>
+          <Connection Comment="" Destination="ArrowheadPublish.publishEvent" Source="FieldsToPublishEvent.publishEvent" dx1="755.0"/>
+          <Connection Comment="" Destination="FieldsToPublishEvent.event" Source="FieldsToArrowheadEvent.arrowheadEvent" dx1="745.0"/>
+          <Connection Comment="" Destination="FieldsToEventFilter.consumer" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="660.0"/>
+          <Connection Comment="" Destination="SubscribeEvent.eventFilter" Source="FieldsToEventFilter.eventFilter" dx1="655.0"/>
+          <Connection Comment="" Destination="F_EQ.IN1" Source="E_CTU.CV" dx1="5510.0"/>
+          <Connection Comment="" Destination="NoMessage.check" Source="F_EQ.OUT"/>
+          <Connection Comment="" Destination="F_EQ_1.IN1" Source="E_CTU.CV" dx1="5510.0"/>
+          <Connection Comment="" Destination="OneMessage.check" Source="F_EQ_1.OUT"/>
+          <Connection Comment="" Destination="TwoMessages.check" Source="F_EQ_1_1.OUT"/>
+          <Connection Comment="" Destination="F_EQ_1_1.IN1" Source="E_CTU.CV" dx1="5560.0"/>
+        </DataConnections>
+        <AdapterConnections>
+          <Connection Comment="" Destination="PublishEventHTTP.publishEvent" Source="ArrowheadPublish.ArrowheadPublishAdp"/>
+          <Connection Comment="" Destination="SubscribeEventHTTP.SubscribeEventAdp" Source="SubscribeEvent.SubscribeEventAdp"/>
+        </AdapterConnections>
+      </FBNetwork>
+    </Resource>
+  </Device>
+  <Device Comment="" Name="OpcUaTest" Type="FORTE_PC" x="6900.0" y="800.0">
+    <Parameter Name="MGR_ID" Value="%opcuaTestAddress%"/>
+    <Attribute Comment="device profile" Name="Profile" Type="STRING" Value="HOLOBLOC"/>
+    <Attribute Comment="color" Name="Color" Type="STRING" Value="230,107,102"/>
+    <Resource Comment="" Name="cleanAll" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="6215.0" y="3600.0">
+          <Parameter Name="ID" Value="%cleanFinished%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="480.0" y="130.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="460.0" y="1080.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadService_1" Type="FieldsToArrowheadService" x="465.0" y="1870.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadSystem_1" Type="FieldsToArrowheadSystem" x="505.0" y="2685.0">
+          <Parameter Name="systemName" Value="%systemName2%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="8115.0" y="3630.0">
+          <Parameter Name="ID" Value="%allEnded%"/>
+        </FB>
+        <FB Comment="" Name="STEST_END" Type="STEST_END" x="9915.0" y="3765.0"/>
+        <FB Comment="" Name="SUBL_0_1" Type="SUBL_0" x="-835.0" y="-20.0">
+          <Parameter Name="ID" Value="%allLoaded%"/>
+        </FB>
+        <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialOpcUa" x="3525.0" y="565.0">
+          <Parameter Name="serviceURI" Value="%serviceURI%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="RegisterService2_1" Type="RegisterServicePartialOpcUa" x="3400.0" y="3680.0">
+          <Parameter Name="serviceURI" Value="%serviceURI2%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialOpcUa" x="3415.0" y="2225.0">
+          <Parameter Name="serviceURI" Value="%serviceURI2%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <EventConnections>
+          <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="475.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1.REQ" Source="FieldsToArrowheadService.CNF" dx1="60.0" dx2="60.0" dy="395.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem_1.REQ" Source="FieldsToArrowheadService_1.CNF" dx1="60.0" dx2="60.0" dy="405.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="PUBL_0.INITO" dx1="700.0"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="SUBL_0.INITO" dx1="60.0" dx2="60.0" dy="35.0"/>
+          <Connection Comment="" Destination="STEST_END.REQ" Source="SUBL_0.IND" dx1="650.0"/>
+          <Connection Comment="" Destination="SUBL_0_1.INIT" Source="START.COLD" dx1="470.0"/>
+          <Connection Comment="" Destination="SUBL_0_1.INIT" Source="START.WARM" dx1="470.0"/>
+          <Connection Comment="" Destination="RegisterService1.unregister" Source="FieldsToArrowheadSystem_1.CNF"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="RegisterService2_1.doneUnregister"/>
+          <Connection Comment="" Destination="RegisterService2.unregister" Source="RegisterService1.doneUnregister"/>
+          <Connection Comment="" Destination="RegisterService2_1.unregister" Source="RegisterService2.doneUnregister"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0_1.IND"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="RegisterService1.providedService" Source="FieldsToArrowheadService.arrowheadService"/>
+          <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem"/>
+          <Connection Comment="" Destination="RegisterService2_1.providedService" Source="FieldsToArrowheadService.arrowheadService"/>
+          <Connection Comment="" Destination="RegisterService2_1.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem"/>
+          <Connection Comment="" Destination="RegisterService2.providedService" Source="FieldsToArrowheadService_1.arrowheadService"/>
+          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem"/>
+        </DataConnections>
+      </FBNetwork>
+    </Resource>
+    <Resource Comment="" Name="RegisterUnregister" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <FB Comment="" Name="QueryService" Type="QueryService" x="7650.0" y="-175.0">
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </FB>
+        <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="9620.0" y="45.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="F_EQ" Type="F_EQ" x="15925.0" y="2010.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="ServiceNotRegisteredPos1" Type="TEST_CONDITION" x="17290.0" y="2070.0"/>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="11355.0" y="-25.0"/>
+        <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="2410.0" y="-1155.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToServiceQueryForm" Type="FieldsToServiceQueryForm" x="5285.0" y="-1175.0">
+          <Parameter Name="version" Value="%serviceVersion%"/>
+        </FB>
+        <FB Comment="" Name="Registered" Type="E_SR" x="13275.0" y="2155.0"/>
+        <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="14230.0" y="2080.0"/>
+        <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="15925.0" y="2725.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="ServiceRegisteredPos0" Type="TEST_CONDITION" x="17290.0" y="2640.0"/>
+        <SubApp Comment="" Name="Sequencer" x="750.0" y="4125.0">
+          <SubAppInterfaceList>
+            <SubAppEventInputs>
+              <SubAppEvent Comment="" Name="Next" Type="Event"/>
+            </SubAppEventInputs>
+            <SubAppEventOutputs>
+              <SubAppEvent Comment="" Name="E0" Type="Event"/>
+              <SubAppEvent Comment="" Name="E1" Type="Event"/>
+              <SubAppEvent Comment="" Name="E2" Type="Event"/>
+              <SubAppEvent Comment="" Name="E3" Type="Event"/>
+              <SubAppEvent Comment="" Name="E4" Type="Event"/>
+              <SubAppEvent Comment="" Name="E5" Type="Event"/>
+              <SubAppEvent Comment="" Name="E6" Type="Event"/>
+              <SubAppEvent Comment="" Name="E7" Type="Event"/>
+            </SubAppEventOutputs>
+          </SubAppInterfaceList>
+        </SubApp>
+        <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="2850.0" y="765.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="5615.0" y="740.0">
+          <Parameter Name="serviceURI" Value="%serviceURI%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+        </FB>
+        <FB Comment="" Name="RegisterService" Type="RegisterService" x="8700.0" y="2805.0">
+          <Parameter Name="endpoint" Value="%serviceRegistryAddress%"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="11350.0" y="940.0"/>
+        <FB Comment="" Name="ServiceNotRegisteredPos0" Type="TEST_CONDITION" x="17140.0" y="1305.0"/>
+        <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="9555.0" y="930.0">
+          <Parameter Name="INDEX" Value="1"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="15900.0" y="1300.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="PUBLISH_0" Type="PUBL_0" x="14125.0" y="4165.0">
+          <Parameter Name="ID" Value="%firstResourceReady%"/>
+        </FB>
+        <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="1135.0" y="-1275.0">
+          <Parameter Name="ID" Value="%cleanFinished%"/>
+        </FB>
+        <FB Comment="" Name="RegisterServiceOpcUa" Type="RegisterServiceOpcUa" x="10700.0" y="3300.0"/>
+        <FB Comment="" Name="QueryServiceOpcUa" Type="QueryServiceOpcUa" x="9545.0" y="1620.0"/>
+        <EventConnections>
+          <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService.queried" dx1="255.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="500.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="540.0"/>
+          <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="645.0"/>
+          <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="590.0"/>
+          <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="610.0"/>
+          <Connection Comment="" Destination="ServiceRegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="500.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="ServiceRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="740.0"/>
+          <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E0" dx1="3250.0"/>
+          <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E2" dx1="3250.0"/>
+          <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E4" dx1="3250.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToServiceQueryForm.CNF" dx1="60.0" dx2="60.0" dy="970.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="590.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="1690.0"/>
+          <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E1" dx1="3775.0"/>
+          <Connection Comment="" Destination="RegisterService.unregister" Source="Sequencer.E3" dx1="3775.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneRegister" dx1="60.0" dx2="60.0" dy="660.0"/>
+          <Connection Comment="" Destination="Registered.S" Source="RegisterService.doneRegister" dx1="1420.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneUnregister" dx1="60.0" dx2="60.0" dy="610.0"/>
+          <Connection Comment="" Destination="Registered.R" Source="RegisterService.doneUnregister" dx1="1420.0"/>
+          <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="1440.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="ServiceNotRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="1410.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="220.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="570.0"/>
+          <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO0" dx1="595.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="435.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="SUBL_0.IND" dx1="385.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="255.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="255.0"/>
+          <Connection Comment="" Destination="PUBLISH_0.INIT" Source="SUBL_0.INITO"/>
+          <Connection Comment="" Destination="PUBLISH_0.REQ" Source="Sequencer.E5"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="255.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="500.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="540.0"/>
+          <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="645.0"/>
+          <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="460.0"/>
+          <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="255.0"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1440.0"/>
+          <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="500.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="810.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="590.0"/>
+          <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="705.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="1440.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="220.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="570.0"/>
+          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1425.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="435.0"/>
+        </DataConnections>
+        <AdapterConnections>
+          <Connection Comment="" Destination="RegisterServiceOpcUa.registerService" Source="RegisterService.registerService"/>
+          <Connection Comment="" Destination="QueryServiceOpcUa.queryServices" Source="QueryService.queryServices"/>
+        </AdapterConnections>
+      </FBNetwork>
+    </Resource>
+    <Resource Comment="" Name="DoubleRegister" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <FB Comment="" Name="QueryService" Type="QueryService" x="8845.0" y="1035.0">
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </FB>
+        <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="10790.0" y="165.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="F_EQ" Type="F_EQ" x="17120.0" y="2450.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="ServiceNotRegisteredPos1" Type="TEST_CONDITION" x="18485.0" y="2510.0"/>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="12545.0" y="180.0"/>
+        <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="3920.0" y="-1505.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToServiceQueryForm" Type="FieldsToServiceQueryForm" x="6790.0" y="-1400.0">
+          <Parameter Name="version" Value="%serviceVersion%"/>
+        </FB>
+        <FB Comment="" Name="Registered" Type="E_SR" x="14470.0" y="2600.0"/>
+        <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="15425.0" y="2520.0"/>
+        <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="17120.0" y="3165.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="ServiceRegisteredPos0" Type="TEST_CONDITION" x="18485.0" y="3080.0"/>
+        <SubApp Comment="" Name="Sequencer" x="1945.0" y="4565.0">
+          <SubAppInterfaceList>
+            <SubAppEventInputs>
+              <SubAppEvent Comment="" Name="Next" Type="Event"/>
+            </SubAppEventInputs>
+            <SubAppEventOutputs>
+              <SubAppEvent Comment="" Name="E0" Type="Event"/>
+              <SubAppEvent Comment="" Name="E1" Type="Event"/>
+              <SubAppEvent Comment="" Name="E2" Type="Event"/>
+              <SubAppEvent Comment="" Name="E3" Type="Event"/>
+              <SubAppEvent Comment="" Name="E4" Type="Event"/>
+              <SubAppEvent Comment="" Name="E5" Type="Event"/>
+              <SubAppEvent Comment="" Name="E6" Type="Event"/>
+              <SubAppEvent Comment="" Name="E7" Type="Event"/>
+            </SubAppEventOutputs>
+          </SubAppInterfaceList>
+        </SubApp>
+        <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="4005.0" y="-220.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToServiceRegistryEntry" Type="FieldsToServiceRegistryEntry" x="6670.0" y="-200.0">
+          <Parameter Name="serviceURI" Value="%serviceURI%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+        </FB>
+        <FB Comment="" Name="RegisterService" Type="RegisterService" x="9890.0" y="3245.0">
+          <Parameter Name="endpoint" Value="%serviceRegistryAddress%"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="12525.0" y="1000.0"/>
+        <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="10770.0" y="985.0">
+          <Parameter Name="INDEX" Value="1"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="17110.0" y="1770.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="ServiceNotRegisteredPos0" Type="TEST_CONDITION" x="18475.0" y="1830.0"/>
+        <FB Comment="" Name="SUBSCRIBE_0" Type="SUBL_0" x="-845.0" y="-1670.0">
+          <Parameter Name="ID" Value="%firstResourceReady%"/>
+        </FB>
+        <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="5590.0" y="5655.0">
+          <Parameter Name="ID" Value="%secondResourceReady%"/>
+        </FB>
+        <FB Comment="" Name="RegisterServiceOpcUa" Type="RegisterServiceOpcUa" x="11680.0" y="3710.0"/>
+        <FB Comment="" Name="QueryServiceOpcUa" Type="QueryServiceOpcUa" x="10740.0" y="2060.0"/>
+        <EventConnections>
+          <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService.queried" dx1="240.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="500.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="550.0"/>
+          <Connection Comment="" Destination="FieldsToServiceQueryForm.REQ" Source="FieldsToArrowheadService.CNF" dx1="645.0"/>
+          <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="595.0"/>
+          <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="610.0"/>
+          <Connection Comment="" Destination="ServiceRegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="500.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="ServiceRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="740.0"/>
+          <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E2" dx1="3250.0"/>
+          <Connection Comment="" Destination="QueryService.query" Source="Sequencer.E4" dx1="3250.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToServiceQueryForm.CNF" dx1="60.0" dx2="60.0" dy="590.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="540.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="2380.0"/>
+          <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E0" dx1="3770.0"/>
+          <Connection Comment="" Destination="RegisterService.register" Source="Sequencer.E1" dx1="3770.0"/>
+          <Connection Comment="" Destination="RegisterService.unregister" Source="Sequencer.E3" dx1="3770.0"/>
+          <Connection Comment="" Destination="Registered.S" Source="RegisterService.doneRegister" dx1="1425.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneRegister" dx1="60.0" dx2="60.0" dy="660.0"/>
+          <Connection Comment="" Destination="Registered.R" Source="RegisterService.doneUnregister" dx1="1425.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="RegisterService.doneUnregister" dx1="60.0" dx2="60.0" dy="610.0"/>
+          <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="1450.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryService.queried" dx1="230.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="550.0"/>
+          <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO0" dx1="605.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="500.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="ServiceNotRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="1365.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="SUBSCRIBE_0.IND" dx1="2130.0"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBSCRIBE_0.INITO" dx1="2965.0"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E5" dx1="1620.0"/>
+          <Connection Comment="" Destination="SUBSCRIBE_0.INIT" Source="START.COLD" dx1="415.0"/>
+          <Connection Comment="" Destination="SUBSCRIBE_0.INIT" Source="START.WARM" dx1="415.0"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService.serviceEntries" dx1="240.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos1.check" Source="F_EQ.OUT" dx1="500.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="550.0"/>
+          <Connection Comment="" Destination="FieldsToServiceQueryForm.service" Source="FieldsToArrowheadService.arrowheadService" dx1="645.0"/>
+          <Connection Comment="" Destination="QueryService.serviceQueryForm" Source="FieldsToServiceQueryForm.serviceQueryForm" dx1="305.0"/>
+          <Connection Comment="" Destination="E_SWITCH.G" Source="Registered.Q" dx1="255.0"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1440.0"/>
+          <Connection Comment="" Destination="ServiceRegisteredPos0.check" Source="F_EQ_1.OUT" dx1="500.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.providedService" Source="FieldsToArrowheadService.arrowheadService" dx1="585.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRegistryEntry.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="540.0"/>
+          <Connection Comment="" Destination="RegisterService.serviceRegistryEntry" Source="FieldsToServiceRegistryEntry.serviceRegistryEntry" dx1="775.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="1450.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService.serviceEntries" dx1="230.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="550.0"/>
+          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="1435.0"/>
+          <Connection Comment="" Destination="ServiceNotRegisteredPos0.check" Source="F_EQ_2.OUT" dx1="500.0"/>
+        </DataConnections>
+        <AdapterConnections>
+          <Connection Comment="" Destination="RegisterServiceOpcUa.registerService" Source="RegisterService.registerService"/>
+          <Connection Comment="" Destination="QueryServiceOpcUa.queryServices" Source="QueryService.queryServices"/>
+        </AdapterConnections>
+      </FBNetwork>
+    </Resource>
+    <Resource Comment="" Name="RegisterMoreServices" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="10105.0" y="6545.0"/>
+        <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="8370.0" y="6525.0">
+          <Parameter Name="INDEX" Value="1"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="10110.0" y="5570.0"/>
+        <FB Comment="" Name="F_EQ" Type="F_EQ" x="16950.0" y="6315.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="-185.0" y="340.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="16920.0" y="4985.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="8375.0" y="5650.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="S1Reg" Type="E_SR" x="11590.0" y="1235.0"/>
+        <FB Comment="" Name="Service2RegisteredPos0" Type="TEST_CONDITION" x="18270.0" y="8815.0"/>
+        <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="13710.0" y="4375.0"/>
+        <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="16675.0" y="8665.0">
+          <Parameter Name="IN1" Value="%validEndpoint2%"/>
+        </FB>
+        <FB Comment="" Name="Service1RegisteredPos0" Type="TEST_CONDITION" x="18170.0" y="5000.0"/>
+        <FB Comment="" Name="Service1NotRegisteredPos1" Type="TEST_CONDITION" x="18175.0" y="6320.0"/>
+        <SubApp Comment="" Name="Sequencer" x="2125.0" y="4020.0">
+          <SubAppInterfaceList>
+            <SubAppEventInputs>
+              <SubAppEvent Comment="" Name="Next" Type="Event"/>
+            </SubAppEventInputs>
+            <SubAppEventOutputs>
+              <SubAppEvent Comment="" Name="E0" Type="Event"/>
+              <SubAppEvent Comment="" Name="E1" Type="Event"/>
+              <SubAppEvent Comment="" Name="E2" Type="Event"/>
+              <SubAppEvent Comment="" Name="E3" Type="Event"/>
+              <SubAppEvent Comment="" Name="E4" Type="Event"/>
+              <SubAppEvent Comment="" Name="E5" Type="Event"/>
+              <SubAppEvent Comment="" Name="E6" Type="Event"/>
+              <SubAppEvent Comment="" Name="E7" Type="Event"/>
+              <SubAppEvent Comment="" Name="E8" Type="Event"/>
+              <SubAppEvent Comment="" Name="E9" Type="Event"/>
+              <SubAppEvent Comment="" Name="E10" Type="Event"/>
+              <SubAppEvent Comment="" Name="E11" Type="Event"/>
+            </SubAppEventOutputs>
+          </SubAppInterfaceList>
+        </SubApp>
+        <FB Comment="" Name="Service2NotRegisteredPos1" Type="TEST_CONDITION" x="18265.0" y="9610.0"/>
+        <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="17015.0" y="9600.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="S2Reg" Type="E_SR" x="11560.0" y="2845.0"/>
+        <FB Comment="" Name="E_SWITCH_1" Type="E_SWITCH" x="13565.0" y="8175.0"/>
+        <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="8360.0" y="8490.0">
+          <Parameter Name="INDEX" Value="1"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="10100.0" y="8510.0"/>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_2" Type="GetEndpointFromServiceRegistryEntry" x="10100.0" y="7535.0"/>
+        <FB Comment="" Name="GET_AT_INDEX_2" Type="GET_AT_INDEX" x="8365.0" y="7615.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="-2060.0" y="355.0">
+          <Parameter Name="ID" Value="%secondResourceReady%"/>
+        </FB>
+        <FB Comment="" Name="Service1NotRegisteredPos0" Type="TEST_CONDITION" x="18085.0" y="4375.0"/>
+        <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="16860.0" y="4355.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="16700.0" y="7875.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="Service2NotRegisteredPos0" Type="TEST_CONDITION" x="17925.0" y="7900.0"/>
+        <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="-180.0" y="1490.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="Service2" Type="FieldsToArrowheadService" x="-175.0" y="2280.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="9020.0" y="12780.0">
+          <Parameter Name="ID" Value="%testMoreServicesReady%"/>
+        </FB>
+        <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialOpcUa" x="7640.0" y="2930.0">
+          <Parameter Name="serviceURI" Value="%serviceURI2%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialOpcUa" x="7600.0" y="1270.0">
+          <Parameter Name="serviceURI" Value="%serviceURI%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryService2" Type="QueryServiceOpcUaSub" x="4010.0" y="7690.0">
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryService1" Type="QueryServiceOpcUaSub" x="4020.0" y="5725.0">
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <EventConnections>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="540.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
+          <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="955.0"/>
+          <Connection Comment="" Destination="F_EQ_2.REQ" Source="E_SWITCH.EO1" dx1="1365.0"/>
+          <Connection Comment="" Destination="Service2RegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="615.0"/>
+          <Connection Comment="" Destination="Service1RegisteredPos0.REQ" Source="F_EQ_2.CNF" dx1="440.0"/>
+          <Connection Comment="" Destination="F_EQ.REQ" Source="Service1RegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="655.0"/>
+          <Connection Comment="" Destination="Service1NotRegisteredPos1.REQ" Source="F_EQ.CNF" dx1="430.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="Service1NotRegisteredPos1.CNF" dx1="60.0" dx2="60.0" dy="-1150.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="S1Reg.EO" dx1="60.0" dx2="60.0" dy="1390.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="Service2NotRegisteredPos1.CNF" dx1="60.0" dx2="60.0" dy="-2795.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Service2RegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="390.0"/>
+          <Connection Comment="" Destination="Service2NotRegisteredPos1.REQ" Source="F_EQ_1_1.CNF" dx1="440.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="S2Reg.EO" dx1="60.0" dx2="60.0" dy="585.0"/>
+          <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH_1.EO1" dx1="1315.0"/>
+          <Connection Comment="" Destination="E_SWITCH_1.EI" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="855.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="510.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_2.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="GET_AT_INDEX_2.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="685.0"/>
+          <Connection Comment="" Destination="F_EQ.REQ" Source="Service1NotRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="970.0"/>
+          <Connection Comment="" Destination="F_EQ_3.REQ" Source="E_SWITCH.EO0" dx1="1335.0"/>
+          <Connection Comment="" Destination="Service1NotRegisteredPos0.REQ" Source="F_EQ_3.CNF" dx1="430.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="E_SWITCH_1.EO0" dx1="1330.0"/>
+          <Connection Comment="" Destination="Service2NotRegisteredPos0.REQ" Source="F_EQ_3_1.CNF" dx1="430.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Service2NotRegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="850.0"/>
+          <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="575.0"/>
+          <Connection Comment="" Destination="Service2.REQ" Source="Service1.CNF" dx1="60.0" dx2="60.0" dy="395.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="Service2.CNF" dx1="360.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="510.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="510.0"/>
+          <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer.E1"/>
+          <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer.E7"/>
+          <Connection Comment="" Destination="S2Reg.S" Source="RegisterService2.doneRegister"/>
+          <Connection Comment="" Destination="S2Reg.R" Source="RegisterService2.doneUnregister"/>
+          <Connection Comment="" Destination="RegisterService1.register" Source="Sequencer.E0"/>
+          <Connection Comment="" Destination="RegisterService1.unregister" Source="Sequencer.E4"/>
+          <Connection Comment="" Destination="S1Reg.S" Source="RegisterService1.doneRegister"/>
+          <Connection Comment="" Destination="S1Reg.R" Source="RegisterService1.doneUnregister"/>
+          <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E3"/>
+          <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E6"/>
+          <Connection Comment="" Destination="QueryService2.REQ" Source="Sequencer.E9"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_2.REQ" Source="QueryService2.CNF"/>
+          <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E2"/>
+          <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E5"/>
+          <Connection Comment="" Destination="QueryService1.REQ" Source="Sequencer.E8"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryService1.CNF"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E10"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="540.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2575.0"/>
+          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2560.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="540.0"/>
+          <Connection Comment="" Destination="E_SWITCH.G" Source="S1Reg.Q" dx1="910.0"/>
+          <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="615.0"/>
+          <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ_2.OUT" dx1="440.0"/>
+          <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_1_1.OUT" dx1="440.0"/>
+          <Connection Comment="" Destination="E_SWITCH_1.G" Source="S2Reg.Q" dx1="855.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="510.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="2580.0"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="2440.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.serviceRegistryEntry" Source="GET_AT_INDEX_2.OUT" dx1="540.0"/>
+          <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2530.0"/>
+          <Connection Comment="" Destination="Service1NotRegisteredPos0.check" Source="F_EQ_3.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="2455.0"/>
+          <Connection Comment="" Destination="Service2NotRegisteredPos0.check" Source="F_EQ_3_1.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service2.arrowheadService"/>
+          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem"/>
+          <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService"/>
+          <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem"/>
+          <Connection Comment="" Destination="QueryService2.service" Source="Service2.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_2.IN_ARRAY" Source="QueryService2.serviceEntries"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryService2.serviceEntries"/>
+          <Connection Comment="" Destination="QueryService1.service" Source="Service1.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryService1.serviceEntries"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryService1.serviceEntries"/>
+        </DataConnections>
+      </FBNetwork>
+    </Resource>
+    <Resource Comment="" Name="SameServiceTwice" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="590.0" y="240.0">
+          <Parameter Name="ID" Value="%testMoreServicesReady%"/>
+        </FB>
+        <SubApp Comment="" Name="Sequencer" x="4565.0" y="3700.0">
+          <SubAppInterfaceList>
+            <SubAppEventInputs>
+              <SubAppEvent Comment="" Name="Next" Type="Event"/>
+            </SubAppEventInputs>
+            <SubAppEventOutputs>
+              <SubAppEvent Comment="" Name="E0" Type="Event"/>
+              <SubAppEvent Comment="" Name="E1" Type="Event"/>
+              <SubAppEvent Comment="" Name="E2" Type="Event"/>
+              <SubAppEvent Comment="" Name="E3" Type="Event"/>
+              <SubAppEvent Comment="" Name="E4" Type="Event"/>
+              <SubAppEvent Comment="" Name="E5" Type="Event"/>
+              <SubAppEvent Comment="" Name="E6" Type="Event"/>
+              <SubAppEvent Comment="" Name="E7" Type="Event"/>
+              <SubAppEvent Comment="" Name="E8" Type="Event"/>
+              <SubAppEvent Comment="" Name="E9" Type="Event"/>
+              <SubAppEvent Comment="" Name="E10" Type="Event"/>
+              <SubAppEvent Comment="" Name="E11" Type="Event"/>
+            </SubAppEventOutputs>
+          </SubAppInterfaceList>
+        </SubApp>
+        <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="4580.0" y="2425.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="4575.0" y="1275.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="9330.0" y="6665.0">
+          <Parameter Name="INDEX" Value="1"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="11070.0" y="5710.0"/>
+        <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="9335.0" y="5790.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="11065.0" y="6685.0"/>
+        <FB Comment="" Name="Service1RegisteredPos0" Type="TEST_CONDITION" x="23345.0" y="4935.0"/>
+        <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="21280.0" y="3320.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="BothServicesRegistered" Type="TEST_CONDITION" x="24410.0" y="2120.0"/>
+        <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="21305.0" y="2675.0">
+          <Parameter Name="IN1" Value="%validEndpoint2%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ" Type="F_EQ" x="22120.0" y="4930.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_2_1" Type="F_EQ" x="21260.0" y="1905.0">
+          <Parameter Name="IN1" Value="%validEndpoint2%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="21280.0" y="1255.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="Service2RegisteredPos0" Type="TEST_CONDITION" x="23315.0" y="6525.0"/>
+        <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="22030.0" y="6450.0">
+          <Parameter Name="IN1" Value="%validEndpoint2%"/>
+        </FB>
+        <FB Comment="" Name="BothServicesNotRegistered" Type="TEST_CONDITION" x="24265.0" y="8240.0"/>
+        <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="22040.0" y="8160.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_1_1_1" Type="F_EQ" x="22040.0" y="8850.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="Service2NotRegisteredPos1" Type="TEST_CONDITION" x="23345.0" y="5600.0"/>
+        <FB Comment="" Name="F_EQ_4" Type="F_EQ" x="22120.0" y="5590.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_4_1" Type="F_EQ" x="22055.0" y="7185.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="Service1NotRegisteredPos1" Type="TEST_CONDITION" x="23280.0" y="7190.0"/>
+        <FB Comment="" Name="F_AND" Type="F_AND" x="23140.0" y="8320.0"/>
+        <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="25835.0" y="6100.0"/>
+        <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="15070.0" y="2825.0"/>
+        <FB Comment="" Name="F_AND_1" Type="F_AND" x="22205.0" y="1545.0"/>
+        <FB Comment="" Name="F_OR" Type="F_OR" x="23910.0" y="2220.0"/>
+        <FB Comment="" Name="F_AND_1_1" Type="F_AND" x="22205.0" y="2900.0"/>
+        <FB Comment="" Name="BOOL2BOOL" Type="BOOL2BOOL" x="23060.0" y="1740.0"/>
+        <FB Comment="" Name="BOOL2BOOL_1" Type="BOOL2BOOL" x="23000.0" y="2665.0"/>
+        <FB Comment="" Name="FieldsToArrowheadSystem_1" Type="FieldsToArrowheadSystem" x="4575.0" y="230.0">
+          <Parameter Name="systemName" Value="%systemName2%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="5850.0" y="7810.0">
+          <Parameter Name="ID" Value="%sameServiceTwiceReady%"/>
+        </FB>
+        <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialOpcUa" x="12410.0" y="3865.0">
+          <Parameter Name="serviceURI" Value="%serviceURI2%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="RegisterService1" Type="RegisterServicePartialOpcUa" x="12365.0" y="2205.0">
+          <Parameter Name="serviceURI" Value="%serviceURI%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryServiceHTTPSub" Type="QueryServiceOpcUaSub" x="7055.0" y="5565.0">
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <EventConnections>
+          <Connection Comment="" Destination="Sequencer.Next" Source="Service1.CNF" dx1="60.0" dx2="60.0" dy="635.0"/>
+          <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="575.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="540.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="60.0" dx2="60.0" dy="-1490.0"/>
+          <Connection Comment="" Destination="F_EQ_2.REQ" Source="F_EQ_3.CNF" dx1="60.0" dx2="60.0" dy="320.0"/>
+          <Connection Comment="" Destination="Service1RegisteredPos0.REQ" Source="F_EQ.CNF" dx1="430.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="Sequencer.E3" dx1="8150.0"/>
+          <Connection Comment="" Destination="F_EQ_2_1.REQ" Source="F_EQ_3_1.CNF" dx1="60.0" dx2="60.0" dy="325.0"/>
+          <Connection Comment="" Destination="F_EQ_1.REQ" Source="Sequencer.E6" dx1="8525.0"/>
+          <Connection Comment="" Destination="Service2RegisteredPos0.REQ" Source="F_EQ_1.CNF" dx1="460.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Sequencer.E9" dx1="8530.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1_1.REQ" Source="F_EQ_1_1.CNF" dx1="60.0" dx2="60.0" dy="345.0"/>
+          <Connection Comment="" Destination="F_EQ_4.REQ" Source="Service1RegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="325.0"/>
+          <Connection Comment="" Destination="Service2NotRegisteredPos1.REQ" Source="F_EQ_4.CNF" dx1="430.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1.REQ" Source="Service2RegisteredPos0.CNF" dx1="60.0" dx2="60.0" dy="330.0"/>
+          <Connection Comment="" Destination="Service1NotRegisteredPos1.REQ" Source="F_EQ_4_1.CNF" dx1="430.0"/>
+          <Connection Comment="" Destination="F_AND.REQ" Source="F_EQ_1_1_1.CNF" dx1="325.0"/>
+          <Connection Comment="" Destination="BothServicesNotRegistered.REQ" Source="F_AND.CNF" dx1="380.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI1" Source="BothServicesRegistered.CNF" dx1="220.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI2" Source="BothServicesNotRegistered.CNF" dx1="225.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI2" Source="Service1NotRegisteredPos1.CNF" dx1="715.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI2" Source="Service2NotRegisteredPos1.CNF" dx1="685.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="60.0" dx2="60.0" dy="-1200.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="60.0" dx2="60.0" dy="435.0"/>
+          <Connection Comment="" Destination="F_AND_1.REQ" Source="F_EQ_2_1.CNF" dx1="290.0"/>
+          <Connection Comment="" Destination="BothServicesRegistered.REQ" Source="F_OR.CNF" dx1="65.0"/>
+          <Connection Comment="" Destination="F_AND_1_1.REQ" Source="F_EQ_2.CNF" dx1="280.0"/>
+          <Connection Comment="" Destination="BOOL2BOOL.REQ" Source="F_AND_1.CNF" dx1="245.0"/>
+          <Connection Comment="" Destination="F_EQ_3.REQ" Source="BOOL2BOOL.CNF" dx1="60.0" dx2="60.0" dy="465.0"/>
+          <Connection Comment="" Destination="BOOL2BOOL_1.REQ" Source="F_AND_1_1.CNF" dx1="195.0"/>
+          <Connection Comment="" Destination="F_OR.REQ" Source="BOOL2BOOL_1.CNF" dx1="195.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem_1.REQ" Source="SUBL_0.IND" dx1="1740.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="FieldsToArrowheadSystem_1.CNF" dx1="60.0" dx2="60.0" dy="520.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="60.0" dx2="60.0" dy="120.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="60.0" dx2="60.0" dy="70.0"/>
+          <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer.E1" dx1="3715.0"/>
+          <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer.E7" dx1="3715.0"/>
+          <Connection Comment="" Destination="E_MERGE_1.EI1" Source="RegisterService2.doneRegister" dx1="665.0"/>
+          <Connection Comment="" Destination="E_MERGE_1.EI2" Source="RegisterService2.doneUnregister" dx1="665.0"/>
+          <Connection Comment="" Destination="RegisterService1.register" Source="Sequencer.E0" dx1="3695.0"/>
+          <Connection Comment="" Destination="RegisterService1.unregister" Source="Sequencer.E4" dx1="3695.0"/>
+          <Connection Comment="" Destination="E_MERGE_1.EI1" Source="RegisterService1.doneRegister" dx1="685.0"/>
+          <Connection Comment="" Destination="E_MERGE_1.EI2" Source="RegisterService1.doneUnregister" dx1="685.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E2" dx1="1040.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E5" dx1="1040.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="Sequencer.E8" dx1="1040.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryServiceHTTPSub.CNF" dx1="485.0"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO" dx1="2380.0"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer.E10" dx1="435.0"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="540.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="540.0"/>
+          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4260.0"/>
+          <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4270.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4680.0"/>
+          <Connection Comment="" Destination="Service1RegisteredPos0.check" Source="F_EQ.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="F_EQ_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4250.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4260.0"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4635.0"/>
+          <Connection Comment="" Destination="Service2RegisteredPos0.check" Source="F_EQ_1.OUT" dx1="460.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="4640.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4640.0"/>
+          <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4680.0"/>
+          <Connection Comment="" Destination="Service2NotRegisteredPos1.check" Source="F_EQ_4.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="4650.0"/>
+          <Connection Comment="" Destination="Service1NotRegisteredPos1.check" Source="F_EQ_4_1.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="F_AND.IN1" Source="F_EQ_1_1.OUT" dx1="365.0"/>
+          <Connection Comment="" Destination="F_AND.IN2" Source="F_EQ_1_1_1.OUT" dx1="325.0"/>
+          <Connection Comment="" Destination="BothServicesNotRegistered.check" Source="F_AND.OUT" dx1="380.0"/>
+          <Connection Comment="" Destination="F_AND_1.IN1" Source="F_EQ_3_1.OUT" dx1="280.0"/>
+          <Connection Comment="" Destination="F_AND_1.IN2" Source="F_EQ_2_1.OUT" dx1="290.0"/>
+          <Connection Comment="" Destination="BothServicesRegistered.check" Source="F_OR.OUT" dx1="65.0"/>
+          <Connection Comment="" Destination="F_AND_1_1.IN1" Source="F_EQ_3.OUT" dx1="265.0"/>
+          <Connection Comment="" Destination="F_AND_1_1.IN2" Source="F_EQ_2.OUT" dx1="280.0"/>
+          <Connection Comment="" Destination="BOOL2BOOL.IN" Source="F_AND_1.OUT" dx1="245.0"/>
+          <Connection Comment="" Destination="F_OR.IN1" Source="BOOL2BOOL.OUT" dx1="165.0"/>
+          <Connection Comment="" Destination="BOOL2BOOL_1.IN" Source="F_AND_1_1.OUT" dx1="195.0"/>
+          <Connection Comment="" Destination="F_OR.IN2" Source="BOOL2BOOL_1.OUT" dx1="195.0"/>
+          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService" dx1="3125.0"/>
+          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem_1.arrowheadSystem" dx1="3125.0"/>
+          <Connection Comment="" Destination="RegisterService1.providedService" Source="Service1.arrowheadService" dx1="3100.0"/>
+          <Connection Comment="" Destination="RegisterService1.provider" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="3105.0"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="Service1.arrowheadService" dx1="445.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="485.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries" dx1="480.0"/>
+        </DataConnections>
+      </FBNetwork>
+    </Resource>
+    <Resource Comment="" Name="VersionInterfaceAndMetadata" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <FB Comment="" Name="FieldsToArrowheadService" Type="FieldsToArrowheadService" x="2930.0" y="2655.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="8225.0" y="2745.0"/>
+        <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="7040.0" y="2705.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_4" Type="F_EQ" x="11035.0" y="2600.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="LowerVersion" Type="TEST_CONDITION" x="12260.0" y="2605.0"/>
+        <FB Comment="" Name="FieldsToArrowheadService_1" Type="FieldsToArrowheadService" x="2905.0" y="3950.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="SameVersion" Type="TEST_CONDITION" x="12235.0" y="3900.0"/>
+        <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="7015.0" y="4000.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="8200.0" y="4040.0"/>
+        <FB Comment="" Name="F_EQ_4_1" Type="F_EQ" x="11010.0" y="3900.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="OneInterfaceOutOfTwo" Type="TEST_CONDITION" x="12205.0" y="5390.0"/>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8170.0" y="5530.0"/>
+        <FB Comment="" Name="F_EQ_4_1_1" Type="F_EQ" x="10980.0" y="5385.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadService_1_1" Type="FieldsToArrowheadService" x="2875.0" y="5440.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="6985.0" y="5490.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="OneInterfaceOutOfTwo_2" Type="TEST_CONDITION" x="12170.0" y="6800.0"/>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2" Type="GetEndpointFromServiceRegistryEntry" x="8135.0" y="6935.0"/>
+        <FB Comment="" Name="F_EQ_4_1_2" Type="F_EQ" x="10945.0" y="6790.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadService_1_2" Type="FieldsToArrowheadService" x="2840.0" y="6845.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="GET_AT_INDEX_1_2" Type="GET_AT_INDEX" x="6950.0" y="6900.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="WrongInterface" Type="TEST_CONDITION" x="12255.0" y="9950.0"/>
+        <FB Comment="" Name="GET_AT_INDEX_1_2_1" Type="GET_AT_INDEX" x="7035.0" y="10050.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1" Type="GetEndpointFromServiceRegistryEntry" x="8220.0" y="10090.0"/>
+        <FB Comment="" Name="FieldsToArrowheadService_1_2_1" Type="FieldsToArrowheadService" x="2925.0" y="10000.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON1&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_4_1_2_1" Type="F_EQ" x="11030.0" y="9945.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="705.0" y="230.0">
+          <Parameter Name="ID" Value="%sameServiceTwiceReady%"/>
+        </FB>
+        <FB Comment="" Name="OnlyOneMetadata" Type="TEST_CONDITION" x="12200.0" y="11345.0"/>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8165.0" y="11485.0"/>
+        <FB Comment="" Name="F_EQ_4_1_2_1_1" Type="F_EQ" x="10975.0" y="11340.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1" Type="FieldsToArrowheadService" x="2870.0" y="11400.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="[&quot;key1=value1&quot;]"/>
+        </FB>
+        <FB Comment="" Name="GET_AT_INDEX_1_2_1_1" Type="GET_AT_INDEX" x="6980.0" y="11445.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8235.0" y="12880.0"/>
+        <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1_1" Type="FieldsToArrowheadService" x="2940.0" y="12790.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_4_1_2_1_1_1" Type="F_EQ" x="11045.0" y="12735.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="GET_AT_INDEX_1_2_1_1_1" Type="GET_AT_INDEX" x="7050.0" y="12840.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="NoMetadataAndAsked" Type="TEST_CONDITION" x="12270.0" y="12740.0"/>
+        <FB Comment="" Name="F_EQ_4_1_2_1_2" Type="F_EQ" x="10750.0" y="8350.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="GET_AT_INDEX_1_2_1_2" Type="GET_AT_INDEX" x="6755.0" y="8455.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="FieldsToArrowheadService_1_2_1_2" Type="FieldsToArrowheadService" x="2645.0" y="8405.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_2" Type="GetEndpointFromServiceRegistryEntry" x="7940.0" y="8500.0"/>
+        <FB Comment="" Name="NoInterface" Type="TEST_CONDITION" x="11975.0" y="8355.0"/>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1" Type="GetEndpointFromServiceRegistryEntry" x="8160.0" y="14440.0"/>
+        <FB Comment="" Name="GET_AT_INDEX_1_2_1_1_1_1" Type="GET_AT_INDEX" x="6975.0" y="14400.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_4_1_2_1_1_1_1" Type="F_EQ" x="10970.0" y="14300.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="WrongMetadaButNotAsked" Type="TEST_CONDITION" x="12200.0" y="14300.0"/>
+        <FB Comment="" Name="FieldsToArrowheadService_1_2_1_1_1_1" Type="FieldsToArrowheadService" x="2865.0" y="14350.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+        </FB>
+        <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="7000.0" y="215.0">
+          <Parameter Name="ID" Value="%versionEnded%"/>
+        </FB>
+        <SubApp Comment="" Name="RegisterServiceFullHTTP" Type="RegisterServiceFullOpcUa" x="5140.0" y="255.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+          <Parameter Name="serviceURI" Value="%serviceURI%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryServiceHTTPSub" Type="QueryServiceOpcUaSub" x="5080.0" y="2905.0">
+          <Parameter Name="version" Value="0"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryServiceHTTPSub_1" Type="QueryServiceOpcUaSub" x="5055.0" y="4200.0">
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryServiceHTTPSub_1_1" Type="QueryServiceOpcUaSub" x="5025.0" y="5690.0">
+          <Parameter Name="metadaSearch" Value="true"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryServiceHTTPSub_1_2" Type="QueryServiceOpcUaSub" x="4990.0" y="7100.0">
+          <Parameter Name="metadaSearch" Value="true"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_2" Type="QueryServiceOpcUaSub" x="4800.0" y="8540.0">
+          <Parameter Name="metadaSearch" Value="true"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1" Type="QueryServiceOpcUaSub" x="5075.0" y="10135.0">
+          <Parameter Name="metadaSearch" Value="true"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1" Type="QueryServiceOpcUaSub" x="5020.0" y="11530.0">
+          <Parameter Name="metadaSearch" Value="true"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1_1" Type="QueryServiceOpcUaSub" x="5090.0" y="12925.0">
+          <Parameter Name="metadaSearch" Value="true"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryServiceHTTPSub_1_2_1_1_1_1" Type="QueryServiceOpcUaSub" x="5015.0" y="14485.0">
+          <Parameter Name="metadaSearch" Value="false"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <EventConnections>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX.CNF" dx1="265.0"/>
+          <Connection Comment="" Destination="F_EQ_4.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="560.0"/>
+          <Connection Comment="" Destination="LowerVersion.REQ" Source="F_EQ_4.CNF" dx1="430.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1.REQ" Source="LowerVersion.CNF" dx1="60.0" dx2="60.0" dy="670.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GET_AT_INDEX_1.CNF" dx1="265.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="560.0"/>
+          <Connection Comment="" Destination="SameVersion.REQ" Source="F_EQ_4_1.CNF"/>
+          <Connection Comment="" Destination="F_EQ_4_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="530.0"/>
+          <Connection Comment="" Destination="OneInterfaceOutOfTwo.REQ" Source="F_EQ_4_1_1.CNF" dx1="390.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_1.REQ" Source="SameVersion.CNF" dx1="60.0" dx2="60.0" dy="770.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="235.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2.CNF" dx1="530.0"/>
+          <Connection Comment="" Destination="OneInterfaceOutOfTwo_2.REQ" Source="F_EQ_4_1_2.CNF" dx1="390.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2.REQ" Source="OneInterfaceOutOfTwo.CNF" dx1="60.0" dx2="60.0" dy="725.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2.REQ" Source="GET_AT_INDEX_1_2.CNF" dx1="235.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1.REQ" Source="GET_AT_INDEX_1_2_1.CNF" dx1="190.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1.CNF" dx1="485.0"/>
+          <Connection Comment="" Destination="WrongInterface.REQ" Source="F_EQ_4_1_2_1.CNF" dx1="345.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1.CNF" dx1="440.0"/>
+          <Connection Comment="" Destination="OnlyOneMetadata.REQ" Source="F_EQ_4_1_2_1_1.CNF" dx1="300.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1.REQ" Source="WrongInterface.CNF" dx1="60.0" dx2="60.0" dy="725.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1.CNF" dx1="145.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1.REQ" Source="OnlyOneMetadata.CNF" dx1="60.0" dx2="60.0" dy="720.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.CNF" dx1="395.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1.CNF" dx1="100.0"/>
+          <Connection Comment="" Destination="NoMetadataAndAsked.REQ" Source="F_EQ_4_1_2_1_1_1.CNF" dx1="255.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_2.REQ" Source="OneInterfaceOutOfTwo_2.CNF" dx1="60.0" dx2="60.0" dy="800.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.REQ" Source="GET_AT_INDEX_1_2_1_2.CNF" dx1="145.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_2.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.CNF" dx1="440.0"/>
+          <Connection Comment="" Destination="NoInterface.REQ" Source="F_EQ_4_1_2_1_2.CNF" dx1="300.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1.REQ" Source="NoInterface.CNF" dx1="60.0" dx2="60.0" dy="820.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.REQ" Source="GET_AT_INDEX_1_2_1_1_1_1.CNF" dx1="60.0" dx2="60.0" dy="20.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.CNF" dx1="350.0"/>
+          <Connection Comment="" Destination="WrongMetadaButNotAsked.REQ" Source="F_EQ_4_1_2_1_1_1_1.CNF"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService_1_2_1_1_1_1.REQ" Source="NoMetadataAndAsked.CNF" dx1="60.0" dx2="60.0" dy="805.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="240.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="240.0"/>
+          <Connection Comment="" Destination="RegisterServiceFullHTTP.register" Source="SUBL_0.IND"/>
+          <Connection Comment="" Destination="RegisterServiceFullHTTP.unregister" Source="WrongMetadaButNotAsked.CNF"/>
+          <Connection Comment="" Destination="FieldsToArrowheadService.REQ" Source="RegisterServiceFullHTTP.doneRegister"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub.REQ" Source="FieldsToArrowheadService.CNF"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryServiceHTTPSub.CNF"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1.REQ" Source="FieldsToArrowheadService_1.CNF"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="QueryServiceHTTPSub_1.CNF"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_1.REQ" Source="FieldsToArrowheadService_1_1.CNF"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="QueryServiceHTTPSub_1_1.CNF"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2.REQ" Source="FieldsToArrowheadService_1_2.CNF"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2.REQ" Source="QueryServiceHTTPSub_1_2.CNF"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.REQ" Source="FieldsToArrowheadService_1_2_1_2.CNF"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.REQ" Source="QueryServiceHTTPSub_1_2_1_2.CNF"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1.REQ" Source="FieldsToArrowheadService_1_2_1.CNF"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1.REQ" Source="QueryServiceHTTPSub_1_2_1.CNF"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1.CNF"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1.CNF"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1.CNF"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1.CNF"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.REQ" Source="FieldsToArrowheadService_1_2_1_1_1_1.CNF"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.REQ" Source="QueryServiceHTTPSub_1_2_1_1_1_1.CNF"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="RegisterServiceFullHTTP.doneUnregister"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="265.0"/>
+          <Connection Comment="" Destination="F_EQ_4.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="560.0"/>
+          <Connection Comment="" Destination="LowerVersion.check" Source="F_EQ_4.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="265.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="560.0"/>
+          <Connection Comment="" Destination="SameVersion.check" Source="F_EQ_4_1.OUT"/>
+          <Connection Comment="" Destination="F_EQ_4_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="530.0"/>
+          <Connection Comment="" Destination="OneInterfaceOutOfTwo.check" Source="F_EQ_4_1_1.OUT" dx1="390.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="235.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2.endpoint" dx1="530.0"/>
+          <Connection Comment="" Destination="OneInterfaceOutOfTwo_2.check" Source="F_EQ_4_1_2.OUT" dx1="390.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2.OUT" dx1="235.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1.OUT" dx1="190.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1.endpoint" dx1="485.0"/>
+          <Connection Comment="" Destination="WrongInterface.check" Source="F_EQ_4_1_2_1.OUT" dx1="345.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1.endpoint" dx1="440.0"/>
+          <Connection Comment="" Destination="OnlyOneMetadata.check" Source="F_EQ_4_1_2_1_1.OUT" dx1="300.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1.OUT" dx1="145.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.endpoint" dx1="395.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1.OUT" dx1="100.0"/>
+          <Connection Comment="" Destination="NoMetadataAndAsked.check" Source="F_EQ_4_1_2_1_1_1.OUT" dx1="255.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_2.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_2.OUT" dx1="145.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_2.endpoint" dx1="440.0"/>
+          <Connection Comment="" Destination="NoInterface.check" Source="F_EQ_4_1_2_1_2.OUT" dx1="300.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_2_1_1_1_1.OUT" dx1="60.0" dx2="60.0" dy="-30.0"/>
+          <Connection Comment="" Destination="F_EQ_4_1_2_1_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1.endpoint" dx1="350.0"/>
+          <Connection Comment="" Destination="WrongMetadaButNotAsked.check" Source="F_EQ_4_1_2_1_1_1_1.OUT"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub.service" Source="FieldsToArrowheadService.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryServiceHTTPSub.serviceEntries"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1.service" Source="FieldsToArrowheadService_1.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryServiceHTTPSub_1.serviceEntries"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_1.service" Source="FieldsToArrowheadService_1_1.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_1.serviceEntries"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2.service" Source="FieldsToArrowheadService_1_2.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2.serviceEntries"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_2.service" Source="FieldsToArrowheadService_1_2_1_2.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_2.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_2.serviceEntries"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1.service" Source="FieldsToArrowheadService_1_2_1.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1.serviceEntries"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1.service" Source="FieldsToArrowheadService_1_2_1_1.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1.serviceEntries"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1.serviceEntries"/>
+          <Connection Comment="" Destination="QueryServiceHTTPSub_1_2_1_1_1_1.service" Source="FieldsToArrowheadService_1_2_1_1_1_1.arrowheadService"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_2_1_1_1_1.IN_ARRAY" Source="QueryServiceHTTPSub_1_2_1_1_1_1.serviceEntries"/>
+        </DataConnections>
+      </FBNetwork>
+    </Resource>
+    <Resource Comment="" Name="RegisterMoreServicesSubApp" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="825.0" y="290.0">
+          <Parameter Name="ID" Value="%versionEnded%"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1" Type="GetEndpointFromServiceRegistryEntry" x="13500.0" y="10115.0"/>
+        <FB Comment="" Name="GET_AT_INDEX_1" Type="GET_AT_INDEX" x="11765.0" y="10100.0">
+          <Parameter Name="INDEX" Value="1"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry" Type="GetEndpointFromServiceRegistryEntry" x="13505.0" y="9140.0"/>
+        <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="2180.0" y="3300.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_2" Type="F_EQ" x="20275.0" y="10730.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="GET_AT_INDEX" Type="GET_AT_INDEX" x="11770.0" y="9220.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="Pos1Empty2" Type="TEST_CONDITION" x="21365.0" y="12865.0"/>
+        <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="20090.0" y="12810.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="Pos1Empty" Type="TEST_CONDITION" x="21525.0" y="10740.0"/>
+        <SubApp Comment="" Name="Sequencer" x="5540.0" y="8165.0">
+          <SubAppInterfaceList>
+            <SubAppEventInputs>
+              <SubAppEvent Comment="" Name="Next" Type="Event"/>
+            </SubAppEventInputs>
+            <SubAppEventOutputs>
+              <SubAppEvent Comment="" Name="E0" Type="Event"/>
+              <SubAppEvent Comment="" Name="E1" Type="Event"/>
+              <SubAppEvent Comment="" Name="E2" Type="Event"/>
+              <SubAppEvent Comment="" Name="E3" Type="Event"/>
+              <SubAppEvent Comment="" Name="E4" Type="Event"/>
+              <SubAppEvent Comment="" Name="E5" Type="Event"/>
+              <SubAppEvent Comment="" Name="E6" Type="Event"/>
+              <SubAppEvent Comment="" Name="E7" Type="Event"/>
+              <SubAppEvent Comment="" Name="E8" Type="Event"/>
+              <SubAppEvent Comment="" Name="E9" Type="Event"/>
+              <SubAppEvent Comment="" Name="E10" Type="Event"/>
+              <SubAppEvent Comment="" Name="E11" Type="Event"/>
+            </SubAppEventOutputs>
+          </SubAppInterfaceList>
+        </SubApp>
+        <FB Comment="" Name="GET_AT_INDEX_1_1" Type="GET_AT_INDEX" x="11775.0" y="12635.0">
+          <Parameter Name="INDEX" Value="1"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_1_1" Type="GetEndpointFromServiceRegistryEntry" x="13510.0" y="12655.0"/>
+        <SubApp Comment="" Name="GetEndpointFromServiceRegistryEntry_2" Type="GetEndpointFromServiceRegistryEntry" x="13515.0" y="11680.0"/>
+        <FB Comment="" Name="GET_AT_INDEX_2" Type="GET_AT_INDEX" x="11780.0" y="11760.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <FB Comment="" Name="Pos0Service1" Type="TEST_CONDITION" x="21440.0" y="10120.0"/>
+        <FB Comment="" Name="F_EQ_3" Type="F_EQ" x="20215.0" y="10100.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_3_1" Type="F_EQ" x="20115.0" y="12020.0">
+          <Parameter Name="IN1" Value="%validEndpoint2%"/>
+        </FB>
+        <FB Comment="" Name="Pos0Service2" Type="TEST_CONDITION" x="21340.0" y="12040.0"/>
+        <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="9075.0" y="7585.0">
+          <Parameter Name="ID" Value="%test6Ended%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="20015.0" y="14735.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_3_1_1" Type="F_EQ" x="20040.0" y="13945.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="Pos1Empty3" Type="TEST_CONDITION" x="21290.0" y="14790.0"/>
+        <FB Comment="" Name="Pos0Empty3" Type="TEST_CONDITION" x="21265.0" y="13965.0"/>
+        <FB Comment="" Name="F_EQ_1_1_1" Type="F_EQ" x="19955.0" y="16260.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="Pos0Empty4" Type="TEST_CONDITION" x="21205.0" y="15490.0"/>
+        <FB Comment="" Name="Pos1Empty4" Type="TEST_CONDITION" x="21230.0" y="16315.0"/>
+        <FB Comment="" Name="F_EQ_3_1_1_1" Type="F_EQ" x="19980.0" y="15470.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="E_MERGE" Type="E_MERGE" x="22645.0" y="13330.0"/>
+        <FB Comment="" Name="E_MERGE_1" Type="E_MERGE" x="15455.0" y="11020.0"/>
+        <SubApp Comment="" Name="RegisterManyServices" Type="RegisterMultipleServicesOpcUa" x="6455.0" y="4225.0">
+          <Parameter Name="serviceDefinition" Value="[&quot;serviceTest&quot;, &quot;serviceTest2&quot;]"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+          <Parameter Name="serviceURI" Value="[&quot;%serviceURI%&quot;, &quot;%serviceURI2%&quot;]"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SREndpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QueryFirstService" Type="QueryServiceOpcUaSubFull" x="8720.0" y="9620.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+          <Parameter Name="metadaSearch" Value="false"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="QuerySecondService" Type="QueryServiceOpcUaSubFull" x="8800.0" y="11665.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+          <Parameter Name="metadaSearch" Value="false"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="address" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <EventConnections>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.REQ" Source="GET_AT_INDEX_1.CNF" dx1="540.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.REQ" Source="GetEndpointFromServiceRegistryEntry.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="425.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.REQ" Source="GET_AT_INDEX.CNF" dx1="60.0" dx2="60.0" dy="440.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="FieldsToArrowheadSystem.CNF" dx1="890.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.REQ" Source="GET_AT_INDEX_1_1.CNF" dx1="510.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.REQ" Source="GetEndpointFromServiceRegistryEntry_2.CNF" dx1="60.0" dx2="60.0" dy="485.0"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_1.REQ" Source="GET_AT_INDEX_2.CNF" dx1="60.0" dx2="60.0" dy="435.0"/>
+          <Connection Comment="" Destination="Pos0Service1.REQ" Source="F_EQ_2.CNF" dx1="400.0"/>
+          <Connection Comment="" Destination="Pos1Empty.REQ" Source="Pos0Service1.CNF" dx1="60.0" dx2="60.0" dy="310.0"/>
+          <Connection Comment="" Destination="F_EQ_3.REQ" Source="Sequencer.E2" dx1="7130.0"/>
+          <Connection Comment="" Destination="F_EQ_2.REQ" Source="F_EQ_3.CNF" dx1="60.0" dx2="60.0" dy="315.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1.REQ" Source="Sequencer.E4" dx1="7080.0"/>
+          <Connection Comment="" Destination="F_EQ_1.REQ" Source="F_EQ_3_1.CNF" dx1="60.0" dx2="60.0" dy="395.0"/>
+          <Connection Comment="" Destination="Pos0Service2.REQ" Source="F_EQ_1.CNF" dx1="440.0"/>
+          <Connection Comment="" Destination="Pos1Empty2.REQ" Source="Pos0Service2.CNF" dx1="60.0" dx2="60.0" dy="410.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1_1.REQ" Source="Sequencer.E7" dx1="7045.0"/>
+          <Connection Comment="" Destination="Pos1Empty3.REQ" Source="F_EQ_1_1.CNF" dx1="455.0"/>
+          <Connection Comment="" Destination="Pos0Empty3.REQ" Source="F_EQ_3_1_1.CNF" dx1="390.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="Pos0Empty3.CNF" dx1="60.0" dx2="60.0" dy="385.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1_1.REQ" Source="Pos0Empty4.CNF" dx1="60.0" dx2="60.0" dy="385.0"/>
+          <Connection Comment="" Destination="Pos1Empty4.REQ" Source="F_EQ_1_1_1.CNF" dx1="415.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1_1_1.REQ" Source="Sequencer.E9" dx1="7015.0"/>
+          <Connection Comment="" Destination="Pos0Empty4.REQ" Source="F_EQ_3_1_1_1.CNF" dx1="345.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty.CNF" dx1="185.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI1" Source="Pos1Empty2.CNF" dx1="265.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty3.CNF" dx1="305.0"/>
+          <Connection Comment="" Destination="E_MERGE.EI2" Source="Pos1Empty4.CNF" dx1="335.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE.EO" dx1="60.0" dx2="60.0" dy="-2580.0"/>
+          <Connection Comment="" Destination="E_MERGE_1.EI1" Source="GetEndpointFromServiceRegistryEntry_1.CNF" dx1="130.0"/>
+          <Connection Comment="" Destination="E_MERGE_1.EI2" Source="GetEndpointFromServiceRegistryEntry_1_1.CNF" dx1="95.0"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="E_MERGE_1.EO" dx1="60.0" dx2="60.0" dy="-1425.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="200.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="200.0"/>
+          <Connection Comment="" Destination="RegisterManyServices.register" Source="Sequencer.E0"/>
+          <Connection Comment="" Destination="RegisterManyServices.unregister" Source="Sequencer.E5"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.registerDone"/>
+          <Connection Comment="" Destination="Sequencer.Next" Source="RegisterManyServices.unregisterUndone"/>
+          <Connection Comment="" Destination="QueryFirstService.REQ" Source="Sequencer.E1"/>
+          <Connection Comment="" Destination="QueryFirstService.REQ" Source="Sequencer.E6"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.REQ" Source="QueryFirstService.CNF"/>
+          <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E3"/>
+          <Connection Comment="" Destination="QuerySecondService.REQ" Source="Sequencer.E8"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_2.REQ" Source="QuerySecondService.CNF"/>
+          <Connection Comment="" Destination="PUBL_0_1.REQ" Source="Sequencer.E10"/>
           <Connection Comment="" Destination="PUBL_0_1.INIT" Source="SUBL_0.INITO"/>
-          <Connection Comment="" Destination="PUBL_0_1.REQ" Source="PUBL_0_1.INITO"/>
-          <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromOrchestrationHTTPPFull.CNF"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1.serviceRegistryEntry" Source="GET_AT_INDEX_1.OUT" dx1="540.0"/>
+          <Connection Comment="" Destination="F_EQ_2.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2540.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry.serviceRegistryEntry" Source="GET_AT_INDEX.OUT" dx1="540.0"/>
+          <Connection Comment="" Destination="Pos1Empty2.check" Source="F_EQ_1.OUT" dx1="455.0"/>
+          <Connection Comment="" Destination="Pos1Empty.check" Source="F_EQ_2.OUT" dx1="440.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_1_1.serviceRegistryEntry" Source="GET_AT_INDEX_1_1.OUT" dx1="510.0"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="2415.0"/>
+          <Connection Comment="" Destination="GetEndpointFromServiceRegistryEntry_2.serviceRegistryEntry" Source="GET_AT_INDEX_2.OUT" dx1="540.0"/>
+          <Connection Comment="" Destination="F_EQ_3.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2510.0"/>
+          <Connection Comment="" Destination="Pos0Service1.check" Source="F_EQ_3.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="2455.0"/>
+          <Connection Comment="" Destination="Pos0Service2.check" Source="F_EQ_3_1.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1.endpoint" dx1="2410.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry.endpoint" dx1="2420.0"/>
+          <Connection Comment="" Destination="Pos1Empty3.check" Source="F_EQ_1_1.OUT" dx1="455.0"/>
+          <Connection Comment="" Destination="Pos0Empty3.check" Source="F_EQ_3_1_1.OUT" dx1="390.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_1_1.endpoint" dx1="2345.0"/>
+          <Connection Comment="" Destination="Pos1Empty4.check" Source="F_EQ_1_1_1.OUT" dx1="415.0"/>
+          <Connection Comment="" Destination="F_EQ_3_1_1_1.IN2" Source="GetEndpointFromServiceRegistryEntry_2.endpoint" dx1="2385.0"/>
+          <Connection Comment="" Destination="Pos0Empty4.check" Source="F_EQ_3_1_1_1.OUT" dx1="345.0"/>
+          <Connection Comment="" Destination="RegisterManyServices.provider" Source="FieldsToArrowheadSystem.arrowheadSystem"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1.IN_ARRAY" Source="QueryFirstService.serviceEntries"/>
+          <Connection Comment="" Destination="GET_AT_INDEX.IN_ARRAY" Source="QueryFirstService.serviceEntries"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_1_1.IN_ARRAY" Source="QuerySecondService.serviceEntries"/>
+          <Connection Comment="" Destination="GET_AT_INDEX_2.IN_ARRAY" Source="QuerySecondService.serviceEntries"/>
+        </DataConnections>
+      </FBNetwork>
+    </Resource>
+    <Resource Comment="" Name="OrchestratorNoRule" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <FB Comment="" Name="FieldsToServiceRequestForm" Type="FieldsToServiceRequestForm" x="9050.0" y="130.0"/>
+        <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="6655.0" y="-835.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="6645.0" y="455.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition2%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <SubApp Comment="" Name="GetEndpointFromOrchestrationForm" Type="GetEndpointFromOrchestrationForm" x="14840.0" y="1300.0"/>
+        <FB Comment="" Name="F_EQ" Type="F_EQ" x="16860.0" y="1210.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="NoServiceAvailable" Type="TEST_CONDITION" x="18085.0" y="1215.0"/>
+        <FB Comment="" Name="E_SR" Type="E_SR" x="9235.0" y="4355.0"/>
+        <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="4135.0" y="-1135.0">
+          <Parameter Name="ID" Value="%test6Ended%"/>
+        </FB>
+        <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="4000.0" y="5675.0">
+          <Parameter Name="ID" Value="%test7Ended%"/>
+        </FB>
+        <FB Comment="" Name="GET_STRUCT_VALUE1" Type="GET_AT_INDEX" x="13665.0" y="1270.0">
+          <Parameter Name="INDEX" Value="0"/>
+        </FB>
+        <SubApp Comment="" Name="Sequencer_1" x="150.0" y="2570.0">
+          <SubAppInterfaceList>
+            <SubAppEventInputs>
+              <SubAppEvent Comment="" Name="Next" Type="Event"/>
+            </SubAppEventInputs>
+            <SubAppEventOutputs>
+              <SubAppEvent Comment="" Name="E0" Type="Event"/>
+              <SubAppEvent Comment="" Name="E1" Type="Event"/>
+              <SubAppEvent Comment="" Name="E2" Type="Event"/>
+              <SubAppEvent Comment="" Name="E3" Type="Event"/>
+              <SubAppEvent Comment="" Name="E4" Type="Event"/>
+              <SubAppEvent Comment="" Name="E5" Type="Event"/>
+              <SubAppEvent Comment="" Name="E6" Type="Event"/>
+              <SubAppEvent Comment="" Name="E7" Type="Event"/>
+              <SubAppEvent Comment="" Name="E8" Type="Event"/>
+              <SubAppEvent Comment="" Name="E9" Type="Event"/>
+              <SubAppEvent Comment="" Name="E10" Type="Event"/>
+              <SubAppEvent Comment="" Name="E11" Type="Event"/>
+            </SubAppEventOutputs>
+          </SubAppInterfaceList>
+        </SubApp>
+        <FB Comment="" Name="RequestOrchestrationForm" Type="RequestOrchestrationForm" x="11675.0" y="1800.0">
+          <Parameter Name="endpoint" Value="%orchestratorAddress%"/>
+        </FB>
+        <FB Comment="" Name="RequestOrchestrationHTTP" Type="RequestOrchestrationOpcUa" x="13705.0" y="2405.0"/>
+        <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialOpcUa" x="9190.0" y="2355.0">
+          <Parameter Name="serviceURI" Value="%serviceURI2%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <FB Comment="" Name="SERVER_1_1" Type="SERVER_0" x="9900.0" y="5600.0">
+          <Parameter Name="ID" Value="opc_ua[CREATE_METHOD;/Objects/serviceTest/start2]"/>
+        </FB>
+        <EventConnections>
+          <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="645.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRequestForm.REQ" Source="Service1.CNF" dx1="410.0"/>
+          <Connection Comment="" Destination="F_EQ.REQ" Source="GetEndpointFromOrchestrationForm.CNF" dx1="230.0"/>
+          <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF" dx1="430.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="1010.0"/>
+          <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.REQ" Source="GET_STRUCT_VALUE1.CNF" dx1="205.0"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="NoServiceAvailable.CNF" dx1="60.0" dx2="60.0" dy="675.0"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="FieldsToServiceRequestForm.CNF" dx1="60.0" dx2="60.0" dy="1220.0"/>
+          <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E3" dx1="4295.0"/>
+          <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E5" dx1="4295.0"/>
+          <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E7" dx1="4295.0"/>
+          <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E10" dx1="4295.0"/>
+          <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E0" dx1="5515.0"/>
+          <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E2" dx1="5515.0"/>
+          <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E4" dx1="5515.0"/>
+          <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E6" dx1="5515.0"/>
+          <Connection Comment="" Destination="RequestOrchestrationForm.requestOrchestator" Source="Sequencer_1.E9" dx1="5515.0"/>
+          <Connection Comment="" Destination="GET_STRUCT_VALUE1.REQ" Source="RequestOrchestrationForm.responseReceived" dx1="60.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="1755.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="1755.0"/>
+          <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer_1.E1"/>
+          <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer_1.E8"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneRegister"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneUnregister"/>
+          <Connection Comment="" Destination="SERVER_1_1.INIT" Source="E_SR.EO"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="SERVER_1_1.INITO"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1.E11"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="FieldsToServiceRequestForm.requesterSystem" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="405.0"/>
+          <Connection Comment="" Destination="FieldsToServiceRequestForm.requestedService" Source="Service1.arrowheadService" dx1="410.0"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationForm.endpoint" dx1="230.0"/>
+          <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="GetEndpointFromOrchestrationForm.orchestrationForm" Source="GET_STRUCT_VALUE1.OUT" dx1="205.0"/>
+          <Connection Comment="" Destination="RequestOrchestrationForm.serviceRequestForm" Source="FieldsToServiceRequestForm.serviceRequestForm" dx1="455.0"/>
+          <Connection Comment="" Destination="GET_STRUCT_VALUE1.IN_ARRAY" Source="RequestOrchestrationForm.orchestrationResponse" dx1="60.0"/>
+          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService"/>
+          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem"/>
+          <Connection Comment="" Destination="SERVER_1_1.QI" Source="E_SR.Q"/>
+        </DataConnections>
+        <AdapterConnections>
+          <Connection Comment="" Destination="RequestOrchestrationHTTP.requestOrchestration" Source="RequestOrchestrationForm.requestOrchestration"/>
+        </AdapterConnections>
+      </FBNetwork>
+    </Resource>
+    <Resource Comment="" Name="OrchestrationWithRules" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="7485.0" y="1090.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+        </FB>
+        <FB Comment="" Name="Service1" Type="FieldsToArrowheadService" x="7475.0" y="2390.0">
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="F_EQ" Type="F_EQ" x="19620.0" y="3100.0">
+          <Parameter Name="IN1" Value="%emptyEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="NoServiceAvailable" Type="TEST_CONDITION" x="20845.0" y="3100.0"/>
+        <FB Comment="" Name="E_SR" Type="E_SR" x="10065.0" y="6290.0"/>
+        <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="4965.0" y="790.0">
+          <Parameter Name="ID" Value="%test7Ended%"/>
+        </FB>
+        <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="4825.0" y="7610.0">
+          <Parameter Name="ID" Value="%test8Ended%"/>
+        </FB>
+        <SubApp Comment="" Name="Sequencer_1" x="980.0" y="4505.0">
+          <SubAppInterfaceList>
+            <SubAppEventInputs>
+              <SubAppEvent Comment="" Name="Next" Type="Event"/>
+            </SubAppEventInputs>
+            <SubAppEventOutputs>
+              <SubAppEvent Comment="" Name="E0" Type="Event"/>
+              <SubAppEvent Comment="" Name="E1" Type="Event"/>
+              <SubAppEvent Comment="" Name="E2" Type="Event"/>
+              <SubAppEvent Comment="" Name="E3" Type="Event"/>
+              <SubAppEvent Comment="" Name="E4" Type="Event"/>
+              <SubAppEvent Comment="" Name="E5" Type="Event"/>
+              <SubAppEvent Comment="" Name="E6" Type="Event"/>
+              <SubAppEvent Comment="" Name="E7" Type="Event"/>
+              <SubAppEvent Comment="" Name="E8" Type="Event"/>
+              <SubAppEvent Comment="" Name="E9" Type="Event"/>
+              <SubAppEvent Comment="" Name="E10" Type="Event"/>
+              <SubAppEvent Comment="" Name="E11" Type="Event"/>
+              <SubAppEvent Comment="" Name="E12" Type="Event"/>
+              <SubAppEvent Comment="" Name="E13" Type="Event"/>
+              <SubAppEvent Comment="" Name="E14" Type="Event"/>
+              <SubAppEvent Comment="" Name="E15" Type="Event"/>
+            </SubAppEventOutputs>
+          </SubAppInterfaceList>
+        </SubApp>
+        <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="19575.0" y="4065.0">
+          <Parameter Name="IN1" Value="%validEndpoint%"/>
+        </FB>
+        <FB Comment="" Name="ServiceAvailable" Type="TEST_CONDITION" x="20800.0" y="4070.0"/>
+        <FB Comment="" Name="E_SR_1" Type="E_SR" x="17120.0" y="2220.0"/>
+        <FB Comment="" Name="E_SWITCH" Type="E_SWITCH" x="18140.0" y="2245.0"/>
+        <FB Comment="" Name="SERVER_1_1" Type="SERVER_0" x="10800.0" y="7600.0">
+          <Parameter Name="ID" Value="opc_ua[CREATE_METHOD;/Objects/serviceTest/start2]"/>
+        </FB>
+        <SubApp Comment="" Name="RegisterService2" Type="RegisterServicePartialOpcUa" x="10020.0" y="4290.0">
+          <Parameter Name="serviceURI" Value="%serviceURI%"/>
+          <Parameter Name="version" Value="%serviceVersion%"/>
+          <Parameter Name="udp" Value="false"/>
+          <Parameter Name="metadata" Value="%metadata%"/>
+          <Parameter Name="SRendpoint" Value="%serviceRegistryAddress%"/>
+        </SubApp>
+        <SubApp Comment="" Name="GetEndpointFromOrchestrationHTTPPFull" Type="GetEndpointFromOrchestrationOpcUaFull" x="12900.0" y="2900.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="%systemPort%"/>
+          <Parameter Name="serviceDefinition" Value="%serviceDefinition%"/>
+          <Parameter Name="interfaces" Value="[&quot;JSON&quot;, &quot;XML&quot;]"/>
+          <Parameter Name="serviceMetadata" Value="%serviceMetadata%"/>
+          <Parameter Name="orchestratorEndpoint" Value="%orchestratorAddress%"/>
+          <Parameter Name="INDEX" Value="0"/>
+        </SubApp>
+        <FB Comment="" Name="E_DELAY" Type="E_DELAY" x="15195.0" y="295.0">
+          <Parameter Name="DT" Value="T#1s"/>
+        </FB>
+        <FB Comment="" Name="E_DELAY_1" Type="E_DELAY" x="18100.0" y="300.0">
+          <Parameter Name="DT" Value="T#1s"/>
+        </FB>
+        <FB Comment="" Name="STRING2STRING_3_1" Type="STRING2STRING" x="16100.0" y="1800.0">
+          <Parameter Name="IN" Value="STRING#%orchRuleData%"/>
+        </FB>
+        <FB Comment="" Name="STRING2STRING_3" Type="STRING2STRING" x="12240.0" y="1540.0">
+          <Parameter Name="IN" Value="STRING#%authRuleData%"/>
+        </FB>
+        <FB Comment="" Name="CLIENT_1_2" Type="CLIENT_1_0" x="13800.0" y="700.0">
+          <Parameter Name="QI" Value="1"/>
+          <Parameter Name="ID" Value="opc_ua[CALL_METHOD; %authRuleEndpoint%#; /Objects/2:Authorization/2:addSystemToAuthorized]"/>
+        </FB>
+        <FB Comment="" Name="CLIENT_1_2_1" Type="CLIENT_1_0" x="18405.0" y="605.0">
+          <Parameter Name="QI" Value="1"/>
+          <Parameter Name="ID" Value="opc_ua[CALL_METHOD; %orchestratorEndpoint%#; /Objects/2:Orchestrator/2:store]"/>
+        </FB>
+        <EventConnections>
+          <Connection Comment="" Destination="Service1.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="650.0"/>
+          <Connection Comment="" Destination="NoServiceAvailable.REQ" Source="F_EQ.CNF"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="SUBL_0.IND" dx1="1010.0"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="NoServiceAvailable.CNF" dx1="60.0" dx2="60.0" dy="700.0"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="Service1.CNF" dx1="60.0" dx2="60.0" dy="1055.0"/>
+          <Connection Comment="" Destination="E_SR.S" Source="Sequencer_1.E5" dx1="4295.0"/>
+          <Connection Comment="" Destination="E_SR.R" Source="Sequencer_1.E10" dx1="4295.0"/>
+          <Connection Comment="" Destination="ServiceAvailable.REQ" Source="F_EQ_1.CNF" dx1="430.0"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="ServiceAvailable.CNF" dx1="60.0" dx2="60.0" dy="215.0"/>
+          <Connection Comment="" Destination="E_SR_1.S" Source="Sequencer_1.E3" dx1="7825.0"/>
+          <Connection Comment="" Destination="E_SR_1.R" Source="Sequencer_1.E8" dx1="7825.0"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="E_SR_1.EO" dx1="60.0" dx2="60.0" dy="1140.0"/>
+          <Connection Comment="" Destination="F_EQ.REQ" Source="E_SWITCH.EO0" dx1="500.0"/>
+          <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_SWITCH.EO1" dx1="480.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="2170.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="2170.0"/>
+          <Connection Comment="" Destination="RegisterService2.register" Source="Sequencer_1.E2"/>
+          <Connection Comment="" Destination="RegisterService2.unregister" Source="Sequencer_1.E7"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneRegister"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="RegisterService2.doneUnregister"/>
           <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E11"/>
           <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E9"/>
           <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E6"/>
           <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E4"/>
           <Connection Comment="" Destination="GetEndpointFromOrchestrationHTTPPFull.REQ" Source="Sequencer_1.E1"/>
+          <Connection Comment="" Destination="E_SWITCH.EI" Source="GetEndpointFromOrchestrationHTTPPFull.CNF"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="SUBL_0.INITO"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1.E12"/>
+          <Connection Comment="" Destination="STRING2STRING_3.REQ" Source="Sequencer_1.E0"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="E_SR.EO"/>
+          <Connection Comment="" Destination="CLIENT_1_2.INIT" Source="STRING2STRING_3.CNF"/>
+          <Connection Comment="" Destination="CLIENT_1_2.REQ" Source="E_DELAY.EO"/>
+          <Connection Comment="" Destination="E_DELAY.START" Source="CLIENT_1_2.INITO"/>
+          <Connection Comment="" Destination="STRING2STRING_3_1.REQ" Source="CLIENT_1_2.CNF"/>
+          <Connection Comment="" Destination="CLIENT_1_2_1.INIT" Source="STRING2STRING_3_1.CNF"/>
+          <Connection Comment="" Destination="CLIENT_1_2_1.REQ" Source="E_DELAY_1.EO"/>
+          <Connection Comment="" Destination="E_DELAY_1.START" Source="CLIENT_1_2_1.INITO"/>
+          <Connection Comment="" Destination="Sequencer_1.Next" Source="CLIENT_1_2_1.CNF"/>
         </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="NoServiceAvailable.check" Source="F_EQ.OUT"/>
+          <Connection Comment="" Destination="ServiceAvailable.check" Source="F_EQ_1.OUT" dx1="430.0"/>
+          <Connection Comment="" Destination="E_SWITCH.G" Source="E_SR_1.Q" dx1="360.0"/>
+          <Connection Comment="" Destination="SERVER_1_1.QI" Source="E_SR.Q"/>
+          <Connection Comment="" Destination="RegisterService2.providedService" Source="Service1.arrowheadService"/>
+          <Connection Comment="" Destination="RegisterService2.provider" Source="FieldsToArrowheadSystem.arrowheadSystem"/>
+          <Connection Comment="" Destination="F_EQ_1.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint"/>
+          <Connection Comment="" Destination="F_EQ.IN2" Source="GetEndpointFromOrchestrationHTTPPFull.endpoint"/>
+          <Connection Comment="" Destination="CLIENT_1_2.SD_1" Source="STRING2STRING_3.OUT"/>
+          <Connection Comment="" Destination="CLIENT_1_2_1.SD_1" Source="STRING2STRING_3_1.OUT"/>
+        </DataConnections>
+      </FBNetwork>
+    </Resource>
+    <Resource Comment="" Name="PublishSubscribe" Type="EMB_RES" x="0.0" y="0.0">
+      <FBNetwork>
+        <FB Comment="" Name="FieldsToPublishEvent" Type="FieldsToPublishEvent" x="9800.0" y="-900.0"/>
+        <FB Comment="" Name="FieldsToArrowheadSystem" Type="FieldsToArrowheadSystem" x="1200.0" y="-1600.0">
+          <Parameter Name="systemName" Value="%systemName%"/>
+          <Parameter Name="address" Value="%testAddress%"/>
+          <Parameter Name="port" Value="8090"/>
+        </FB>
+        <FB Comment="" Name="ArrowheadPublish" Type="ArrowheadPublish" x="12800.0" y="-200.0">
+          <Parameter Name="endpoint" Value="%eventHandlerAddress%"/>
+        </FB>
+        <FB Comment="" Name="PublishEventHTTP" Type="PublishEventOpcUa" x="14500.0" y="700.0"/>
+        <FB Comment="" Name="FieldsToArrowheadEvent" Type="FieldsToArrowheadEvent" x="1200.0" y="-600.0">
+          <Parameter Name="type" Value="%eventType%"/>
+          <Parameter Name="payload" Value="%eventPayload%"/>
+          <Parameter Name="eventMetadata" Value="%serviceMetadata%"/>
+        </FB>
+        <FB Comment="" Name="FieldsToEventFilter" Type="FieldsToEventFilter" x="9170.0" y="2940.0">
+          <Parameter Name="eventType" Value="%eventType%"/>
+          <Parameter Name="filterMetadata" Value="%serviceMetadata%"/>
+          <Parameter Name="notifyUri" Value="WSTRING#/subscribePath"/>
+          <Parameter Name="matchMetadata" Value="BOOL#TRUE"/>
+        </FB>
+        <FB Comment="" Name="SubscribeEvent" Type="SubscribeEvent" x="11700.0" y="2500.0">
+          <Parameter Name="endpoint" Value="%eventHandlerAddress%"/>
+        </FB>
+        <FB Comment="" Name="SubscribeEventHTTP" Type="SubscribeEventOpcUa" x="14670.0" y="3640.0"/>
+        <FB Comment="" Name="E_CTU" Type="E_CTU" x="1300.0" y="6800.0"/>
+        <FB Comment="" Name="F_EQ" Type="F_EQ" x="11600.0" y="6500.0">
+          <Parameter Name="IN2" Value="UINT#0"/>
+        </FB>
+        <FB Comment="" Name="E_DELAY" Type="E_DELAY" x="9800.0" y="6100.0">
+          <Parameter Name="DT" Value="T#2s"/>
+        </FB>
+        <FB Comment="" Name="NoMessage" Type="TEST_CONDITION" x="12500.0" y="6500.0"/>
+        <FB Comment="" Name="F_EQ_1" Type="F_EQ" x="11600.0" y="7500.0">
+          <Parameter Name="IN2" Value="UINT#1"/>
+        </FB>
+        <FB Comment="" Name="OneMessage" Type="TEST_CONDITION" x="12500.0" y="7500.0"/>
+        <FB Comment="" Name="E_DELAY_1" Type="E_DELAY" x="9800.0" y="7100.0">
+          <Parameter Name="DT" Value="T#2s"/>
+        </FB>
+        <FB Comment="" Name="E_DELAY_1_1" Type="E_DELAY" x="9900.0" y="8300.0">
+          <Parameter Name="DT" Value="T#2s"/>
+        </FB>
+        <FB Comment="" Name="F_EQ_1_1" Type="F_EQ" x="11700.0" y="8700.0">
+          <Parameter Name="IN2" Value="UINT#2"/>
+        </FB>
+        <FB Comment="" Name="TwoMessages" Type="TEST_CONDITION" x="12600.0" y="8700.0"/>
+        <SubApp Comment="" Name="Sequencer_1_1" x="-1300.0" y="600.0">
+          <SubAppInterfaceList>
+            <SubAppEventInputs>
+              <SubAppEvent Comment="" Name="Next" Type="Event"/>
+            </SubAppEventInputs>
+            <SubAppEventOutputs>
+              <SubAppEvent Comment="" Name="E0" Type="Event"/>
+              <SubAppEvent Comment="" Name="E1" Type="Event"/>
+              <SubAppEvent Comment="" Name="E2" Type="Event"/>
+              <SubAppEvent Comment="" Name="E3" Type="Event"/>
+              <SubAppEvent Comment="" Name="E4" Type="Event"/>
+              <SubAppEvent Comment="" Name="E5" Type="Event"/>
+              <SubAppEvent Comment="" Name="E6" Type="Event"/>
+              <SubAppEvent Comment="" Name="E7" Type="Event"/>
+              <SubAppEvent Comment="" Name="E8" Type="Event"/>
+              <SubAppEvent Comment="" Name="E9" Type="Event"/>
+              <SubAppEvent Comment="" Name="E10" Type="Event"/>
+              <SubAppEvent Comment="" Name="E11" Type="Event"/>
+              <SubAppEvent Comment="" Name="E12" Type="Event"/>
+              <SubAppEvent Comment="" Name="E13" Type="Event"/>
+              <SubAppEvent Comment="" Name="E14" Type="Event"/>
+              <SubAppEvent Comment="" Name="E15" Type="Event"/>
+            </SubAppEventOutputs>
+          </SubAppInterfaceList>
+        </SubApp>
+        <FB Comment="" Name="SUBL_0" Type="SUBL_0" x="-2100.0" y="-1900.0">
+          <Parameter Name="ID" Value="%test8Ended%"/>
+        </FB>
+        <FB Comment="" Name="PUBL_0_1" Type="PUBL_0" x="-600.0" y="-2300.0">
+          <Parameter Name="ID" Value="%allLoaded%"/>
+        </FB>
+        <FB Comment="" Name="PUBL_0" Type="PUBL_0" x="1000.0" y="3800.0">
+          <Parameter Name="ID" Value="%allEnded%"/>
+        </FB>
+        <FB Comment="" Name="SERVER_1_0" Type="SERVER_1" x="35.0" y="6350.0">
+          <Parameter Name="QI" Value="1"/>
+          <Parameter Name="ID" Value="http[/subscribePath]"/>
+        </FB>
+        <FB Comment="" Name="STRING2STRING" Type="STRING2STRING" x="-1090.0" y="7590.0"/>
+        <EventConnections>
+          <Connection Comment="" Destination="ArrowheadPublish.publish" Source="FieldsToPublishEvent.CNF" dx1="755.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadEvent.REQ" Source="FieldsToArrowheadSystem.CNF" dx1="60.0" dx2="60.0" dy="500.0"/>
+          <Connection Comment="" Destination="F_EQ.REQ" Source="E_DELAY.EO" dx1="685.0"/>
+          <Connection Comment="" Destination="NoMessage.REQ" Source="F_EQ.CNF"/>
+          <Connection Comment="" Destination="OneMessage.REQ" Source="F_EQ_1.CNF"/>
+          <Connection Comment="" Destination="F_EQ_1.REQ" Source="E_DELAY_1.EO" dx1="685.0"/>
+          <Connection Comment="" Destination="F_EQ_1_1.REQ" Source="E_DELAY_1_1.EO" dx1="655.0"/>
+          <Connection Comment="" Destination="TwoMessages.REQ" Source="F_EQ_1_1.CNF"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="TwoMessages.CNF" dx1="60.0" dx2="60.0" dy="-4050.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="OneMessage.CNF" dx1="60.0" dx2="60.0" dy="-3450.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="NoMessage.CNF" dx1="60.0" dx2="60.0" dy="-2950.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="FieldsToEventFilter.CNF" dx1="60.0" dx2="60.0" dy="-1170.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="ArrowheadPublish.published" dx1="60.0" dx2="60.0" dy="400.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SubscribeEvent.Subscribed" dx1="60.0" dx2="60.0" dy="-950.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SubscribeEvent.Unsubscribed" dx1="60.0" dx2="60.0" dy="-1000.0"/>
+          <Connection Comment="" Destination="FieldsToArrowheadSystem.REQ" Source="Sequencer_1_1.E0" dx1="960.0"/>
+          <Connection Comment="" Destination="FieldsToPublishEvent.REQ" Source="Sequencer_1_1.E1" dx1="5260.0"/>
+          <Connection Comment="" Destination="E_DELAY.START" Source="Sequencer_1_1.E2" dx1="5260.0"/>
+          <Connection Comment="" Destination="SubscribeEvent.Subscribe" Source="Sequencer_1_1.E3" dx1="6210.0"/>
+          <Connection Comment="" Destination="E_DELAY.START" Source="Sequencer_1_1.E4" dx1="5260.0"/>
+          <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E5" dx1="6760.0"/>
+          <Connection Comment="" Destination="E_DELAY_1.START" Source="Sequencer_1_1.E6" dx1="5260.0"/>
+          <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E7" dx1="6760.0"/>
+          <Connection Comment="" Destination="E_DELAY_1_1.START" Source="Sequencer_1_1.E8" dx1="5310.0"/>
+          <Connection Comment="" Destination="SubscribeEvent.Unsubscribe" Source="Sequencer_1_1.E9" dx1="6210.0"/>
+          <Connection Comment="" Destination="ArrowheadPublish.publish" Source="Sequencer_1_1.E10" dx1="6760.0"/>
+          <Connection Comment="" Destination="E_DELAY_1_1.START" Source="Sequencer_1_1.E11" dx1="5310.0"/>
+          <Connection Comment="" Destination="Sequencer_1_1.Next" Source="SUBL_0.IND" dx1="240.0"/>
+          <Connection Comment="" Destination="PUBL_0_1.INIT" Source="SUBL_0.INITO" dx1="500.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.COLD" dx1="540.0"/>
+          <Connection Comment="" Destination="SUBL_0.INIT" Source="START.WARM" dx1="540.0"/>
+          <Connection Comment="" Destination="PUBL_0.INIT" Source="PUBL_0_1.INITO"/>
+          <Connection Comment="" Destination="PUBL_0.REQ" Source="Sequencer_1_1.E12"/>
+          <Connection Comment="" Destination="PUBL_0_1.REQ" Source="PUBL_0.INITO"/>
+          <Connection Comment="" Destination="SERVER_1_0.INIT" Source="FieldsToArrowheadEvent.CNF"/>
+          <Connection Comment="" Destination="SERVER_1_0.RSP" Source="E_CTU.CUO"/>
+          <Connection Comment="" Destination="FieldsToEventFilter.REQ" Source="SERVER_1_0.INITO"/>
+          <Connection Comment="" Destination="E_CTU.CU" Source="SERVER_1_0.IND"/>
+        </EventConnections>
+        <DataConnections>
+          <Connection Comment="" Destination="FieldsToPublishEvent.source" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="3510.0"/>
+          <Connection Comment="" Destination="ArrowheadPublish.publishEvent" Source="FieldsToPublishEvent.publishEvent" dx1="755.0"/>
+          <Connection Comment="" Destination="FieldsToPublishEvent.event" Source="FieldsToArrowheadEvent.arrowheadEvent" dx1="3645.0"/>
+          <Connection Comment="" Destination="FieldsToEventFilter.consumer" Source="FieldsToArrowheadSystem.arrowheadSystem" dx1="3195.0"/>
+          <Connection Comment="" Destination="SubscribeEvent.eventFilter" Source="FieldsToEventFilter.eventFilter" dx1="655.0"/>
+          <Connection Comment="" Destination="F_EQ.IN1" Source="E_CTU.CV" dx1="4980.0"/>
+          <Connection Comment="" Destination="NoMessage.check" Source="F_EQ.OUT"/>
+          <Connection Comment="" Destination="F_EQ_1.IN1" Source="E_CTU.CV" dx1="4980.0"/>
+          <Connection Comment="" Destination="OneMessage.check" Source="F_EQ_1.OUT"/>
+          <Connection Comment="" Destination="F_EQ_1_1.IN1" Source="E_CTU.CV" dx1="5030.0"/>
+          <Connection Comment="" Destination="TwoMessages.check" Source="F_EQ_1_1.OUT"/>
+          <Connection Comment="" Destination="SERVER_1_0.SD_1" Source="STRING2STRING.OUT"/>
+        </DataConnections>
+        <AdapterConnections>
+          <Connection Comment="" Destination="PublishEventHTTP.publishEvent" Source="ArrowheadPublish.ArrowheadPublishAdp" dx1="75.0"/>
+          <Connection Comment="" Destination="SubscribeEventHTTP.SubscribeEventAdp" Source="SubscribeEvent.SubscribeEventAdp" dx1="775.0"/>
+        </AdapterConnections>
       </FBNetwork>
     </Resource>
   </Device>
@@ -3408,7 +7566,6 @@
   <Mapping From="HTTPTest2DoubleRegister.FieldsToServiceRegistryEntry" To="HTTPTest.DoubleRegister.FieldsToServiceRegistryEntry"/>
   <Mapping From="HTTPTest2DoubleRegister.RegisterService" To="HTTPTest.DoubleRegister.RegisterService"/>
   <Mapping From="HTTPTest2DoubleRegister.RegisterServiceHTTP" To="HTTPTest.DoubleRegister.RegisterServiceHTTP"/>
-  <Mapping From="HTTPTest2DoubleRegister.GetEndpointFromServiceRegistryEntry_1" To="HTTPTest.DoubleRegister.GetEndpointFromServiceRegistryEntry_1"/>
   <Mapping From="HTTPTest2DoubleRegister.GET_AT_INDEX_1" To="HTTPTest.DoubleRegister.GET_AT_INDEX_1"/>
   <Mapping From="HTTPTest2DoubleRegister.F_EQ_2" To="HTTPTest.DoubleRegister.F_EQ_2"/>
   <Mapping From="HTTPTest2DoubleRegister.ServiceNotRegisteredPos0" To="HTTPTest.DoubleRegister.ServiceNotRegisteredPos0"/>
@@ -3622,8 +7779,309 @@
   <Mapping From="HTTPTest8OrchestrationWithRules.CLIENT_1_2" To="HTTPTest.OrchestrationWithRules.CLIENT_1_2"/>
   <Mapping From="HTTPTest8OrchestrationWithRules.CLIENT_1_2_1" To="HTTPTest.OrchestrationWithRules.CLIENT_1_2_1"/>
   <Mapping From="HTTPTest8OrchestrationWithRules.STRING2STRING" To="HTTPTest.OrchestrationWithRules.STRING2STRING"/>
-  <Mapping From="HTTPTest8OrchestrationWithRules.GetEndpointFromOrchestrationHTTPPFull" To="HTTPTest.OrchestrationWithRules.GetEndpointFromOrchestrationHTTPPFull"/>
-  <Mapping From="HTTPTest7OrchestrationNoRules.RequestOrchestrationForm" To="HTTPTest.OrchestratorNoRule.RequestOrchestrationForm"/>
   <Mapping From="HTTPTest0CleanALL.SUBL_0_1" To="HTTPTest.cleanAll.SUBL_0_1"/>
-  <Mapping From="HTTPTest8OrchestrationWithRules.PUBL_0_1" To="HTTPTest.OrchestrationWithRules.PUBL_0_1"/>
+  <Mapping From="HTTPTest7OrchestrationNoRules.RequestOrchestrationForm" To="HTTPTest.OrchestratorNoRule.RequestOrchestrationForm"/>
+  <Mapping From="HTTPTest2DoubleRegister.GetEndpointFromServiceRegistryEntry_1" To="HTTPTest.DoubleRegister.GetEndpointFromServiceRegistryEntry_1"/>
+  <Mapping From="HTTPTest9PublishSubscribe.FieldsToArrowheadSystem" To="HTTPTest.PublishSubscribe.FieldsToArrowheadSystem"/>
+  <Mapping From="HTTPTest9PublishSubscribe.FieldsToPublishEvent" To="HTTPTest.PublishSubscribe.FieldsToPublishEvent"/>
+  <Mapping From="HTTPTest9PublishSubscribe.ArrowheadPublish" To="HTTPTest.PublishSubscribe.ArrowheadPublish"/>
+  <Mapping From="HTTPTest9PublishSubscribe.FieldsToArrowheadEvent" To="HTTPTest.PublishSubscribe.FieldsToArrowheadEvent"/>
+  <Mapping From="HTTPTest9PublishSubscribe.SubscribeEvent" To="HTTPTest.PublishSubscribe.SubscribeEvent"/>
+  <Mapping From="HTTPTest9PublishSubscribe.FieldsToEventFilter" To="HTTPTest.PublishSubscribe.FieldsToEventFilter"/>
+  <Mapping From="HTTPTest9PublishSubscribe.E_CTU" To="HTTPTest.PublishSubscribe.E_CTU"/>
+  <Mapping From="HTTPTest9PublishSubscribe.F_EQ" To="HTTPTest.PublishSubscribe.F_EQ"/>
+  <Mapping From="HTTPTest9PublishSubscribe.E_DELAY" To="HTTPTest.PublishSubscribe.E_DELAY"/>
+  <Mapping From="HTTPTest9PublishSubscribe.NoMessage" To="HTTPTest.PublishSubscribe.NoMessage"/>
+  <Mapping From="HTTPTest9PublishSubscribe.E_DELAY_1" To="HTTPTest.PublishSubscribe.E_DELAY_1"/>
+  <Mapping From="HTTPTest9PublishSubscribe.F_EQ_1" To="HTTPTest.PublishSubscribe.F_EQ_1"/>
+  <Mapping From="HTTPTest9PublishSubscribe.OneMessage" To="HTTPTest.PublishSubscribe.OneMessage"/>
+  <Mapping From="HTTPTest9PublishSubscribe.E_DELAY_1_1" To="HTTPTest.PublishSubscribe.E_DELAY_1_1"/>
+  <Mapping From="HTTPTest9PublishSubscribe.TwoMessages" To="HTTPTest.PublishSubscribe.TwoMessages"/>
+  <Mapping From="HTTPTest9PublishSubscribe.F_EQ_1_1" To="HTTPTest.PublishSubscribe.F_EQ_1_1"/>
+  <Mapping From="HTTPTest9PublishSubscribe.Sequencer_1_1" To="HTTPTest.PublishSubscribe.Sequencer_1_1"/>
+  <Mapping From="HTTPTest8OrchestrationWithRules.GetEndpointFromOrchestrationHTTPPFull" To="HTTPTest.OrchestrationWithRules.GetEndpointFromOrchestrationHTTPPFull"/>
+  <Mapping From="HTTPTest9PublishSubscribe.SERVER_1_0" To="HTTPTest.PublishSubscribe.SERVER_1_0"/>
+  <Mapping From="HTTPTest9PublishSubscribe.PUBL_0_1" To="HTTPTest.PublishSubscribe.PUBL_0_1"/>
+  <Mapping From="HTTPTest9PublishSubscribe.SUBL_0" To="HTTPTest.PublishSubscribe.SUBL_0"/>
+  <Mapping From="HTTPTest9PublishSubscribe.PUBL_0" To="HTTPTest.PublishSubscribe.PUBL_0"/>
+  <Mapping From="HTTPTest9PublishSubscribe.PublishEventHTTP" To="HTTPTest.PublishSubscribe.PublishEventHTTP"/>
+  <Mapping From="HTTPTest9PublishSubscribe.SubscribeEventHTTP" To="HTTPTest.PublishSubscribe.SubscribeEventHTTP"/>
+  <Mapping From="OpcUaTest0CleanALL.PUBL_0" To="OpcUaTest.cleanAll.PUBL_0"/>
+  <Mapping From="OpcUaTest0CleanALL.FieldsToArrowheadSystem" To="OpcUaTest.cleanAll.FieldsToArrowheadSystem"/>
+  <Mapping From="OpcUaTest0CleanALL.FieldsToArrowheadService" To="OpcUaTest.cleanAll.FieldsToArrowheadService"/>
+  <Mapping From="OpcUaTest0CleanALL.FieldsToArrowheadService_1" To="OpcUaTest.cleanAll.FieldsToArrowheadService_1"/>
+  <Mapping From="OpcUaTest0CleanALL.FieldsToArrowheadSystem_1" To="OpcUaTest.cleanAll.FieldsToArrowheadSystem_1"/>
+  <Mapping From="OpcUaTest0CleanALL.SUBL_0" To="OpcUaTest.cleanAll.SUBL_0"/>
+  <Mapping From="OpcUaTest0CleanALL.STEST_END" To="OpcUaTest.cleanAll.STEST_END"/>
+  <Mapping From="OpcUaTest0CleanALL.SUBL_0_1" To="OpcUaTest.cleanAll.SUBL_0_1"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.QueryService" To="OpcUaTest.RegisterUnregister.QueryService"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.GET_AT_INDEX" To="OpcUaTest.RegisterUnregister.GET_AT_INDEX"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.F_EQ" To="OpcUaTest.RegisterUnregister.F_EQ"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.ServiceNotRegisteredPos1" To="OpcUaTest.RegisterUnregister.ServiceNotRegisteredPos1"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.GetEndpointFromServiceRegistryEntry" To="OpcUaTest.RegisterUnregister.GetEndpointFromServiceRegistryEntry"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.FieldsToArrowheadService" To="OpcUaTest.RegisterUnregister.FieldsToArrowheadService"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.FieldsToServiceQueryForm" To="OpcUaTest.RegisterUnregister.FieldsToServiceQueryForm"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.Registered" To="OpcUaTest.RegisterUnregister.Registered"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.E_SWITCH" To="OpcUaTest.RegisterUnregister.E_SWITCH"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.F_EQ_1" To="OpcUaTest.RegisterUnregister.F_EQ_1"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.ServiceRegisteredPos0" To="OpcUaTest.RegisterUnregister.ServiceRegisteredPos0"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.Sequencer" To="OpcUaTest.RegisterUnregister.Sequencer"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.FieldsToArrowheadSystem" To="OpcUaTest.RegisterUnregister.FieldsToArrowheadSystem"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.FieldsToServiceRegistryEntry" To="OpcUaTest.RegisterUnregister.FieldsToServiceRegistryEntry"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.RegisterService" To="OpcUaTest.RegisterUnregister.RegisterService"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.GetEndpointFromServiceRegistryEntry_1" To="OpcUaTest.RegisterUnregister.GetEndpointFromServiceRegistryEntry_1"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.ServiceNotRegisteredPos0" To="OpcUaTest.RegisterUnregister.ServiceNotRegisteredPos0"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.GET_AT_INDEX_1" To="OpcUaTest.RegisterUnregister.GET_AT_INDEX_1"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.F_EQ_2" To="OpcUaTest.RegisterUnregister.F_EQ_2"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.PUBLISH_0" To="OpcUaTest.RegisterUnregister.PUBLISH_0"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.SUBL_0" To="OpcUaTest.RegisterUnregister.SUBL_0"/>
+  <Mapping From="OpcUaTest2DoubleRegister.QueryService" To="OpcUaTest.DoubleRegister.QueryService"/>
+  <Mapping From="OpcUaTest2DoubleRegister.GET_AT_INDEX" To="OpcUaTest.DoubleRegister.GET_AT_INDEX"/>
+  <Mapping From="OpcUaTest2DoubleRegister.F_EQ" To="OpcUaTest.DoubleRegister.F_EQ"/>
+  <Mapping From="OpcUaTest2DoubleRegister.ServiceNotRegisteredPos1" To="OpcUaTest.DoubleRegister.ServiceNotRegisteredPos1"/>
+  <Mapping From="OpcUaTest2DoubleRegister.GetEndpointFromServiceRegistryEntry" To="OpcUaTest.DoubleRegister.GetEndpointFromServiceRegistryEntry"/>
+  <Mapping From="OpcUaTest2DoubleRegister.FieldsToArrowheadService" To="OpcUaTest.DoubleRegister.FieldsToArrowheadService"/>
+  <Mapping From="OpcUaTest2DoubleRegister.FieldsToServiceQueryForm" To="OpcUaTest.DoubleRegister.FieldsToServiceQueryForm"/>
+  <Mapping From="OpcUaTest2DoubleRegister.Registered" To="OpcUaTest.DoubleRegister.Registered"/>
+  <Mapping From="OpcUaTest2DoubleRegister.E_SWITCH" To="OpcUaTest.DoubleRegister.E_SWITCH"/>
+  <Mapping From="OpcUaTest2DoubleRegister.F_EQ_1" To="OpcUaTest.DoubleRegister.F_EQ_1"/>
+  <Mapping From="OpcUaTest2DoubleRegister.ServiceRegisteredPos0" To="OpcUaTest.DoubleRegister.ServiceRegisteredPos0"/>
+  <Mapping From="OpcUaTest2DoubleRegister.Sequencer" To="OpcUaTest.DoubleRegister.Sequencer"/>
+  <Mapping From="OpcUaTest2DoubleRegister.FieldsToArrowheadSystem" To="OpcUaTest.DoubleRegister.FieldsToArrowheadSystem"/>
+  <Mapping From="OpcUaTest2DoubleRegister.FieldsToServiceRegistryEntry" To="OpcUaTest.DoubleRegister.FieldsToServiceRegistryEntry"/>
+  <Mapping From="OpcUaTest2DoubleRegister.RegisterService" To="OpcUaTest.DoubleRegister.RegisterService"/>
+  <Mapping From="OpcUaTest2DoubleRegister.GetEndpointFromServiceRegistryEntry_1" To="OpcUaTest.DoubleRegister.GetEndpointFromServiceRegistryEntry_1"/>
+  <Mapping From="OpcUaTest2DoubleRegister.GET_AT_INDEX_1" To="OpcUaTest.DoubleRegister.GET_AT_INDEX_1"/>
+  <Mapping From="OpcUaTest2DoubleRegister.F_EQ_2" To="OpcUaTest.DoubleRegister.F_EQ_2"/>
+  <Mapping From="OpcUaTest2DoubleRegister.ServiceNotRegisteredPos0" To="OpcUaTest.DoubleRegister.ServiceNotRegisteredPos0"/>
+  <Mapping From="OpcUaTest2DoubleRegister.SUBSCRIBE_0" To="OpcUaTest.DoubleRegister.SUBSCRIBE_0"/>
+  <Mapping From="OpcUaTest2DoubleRegister.PUBL_0" To="OpcUaTest.DoubleRegister.PUBL_0"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.GetEndpointFromServiceRegistryEntry_1" To="OpcUaTest.RegisterMoreServices.GetEndpointFromServiceRegistryEntry_1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.GET_AT_INDEX_1" To="OpcUaTest.RegisterMoreServices.GET_AT_INDEX_1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.GetEndpointFromServiceRegistryEntry" To="OpcUaTest.RegisterMoreServices.GetEndpointFromServiceRegistryEntry"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.F_EQ" To="OpcUaTest.RegisterMoreServices.F_EQ"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.FieldsToArrowheadSystem" To="OpcUaTest.RegisterMoreServices.FieldsToArrowheadSystem"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.F_EQ_2" To="OpcUaTest.RegisterMoreServices.F_EQ_2"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.GET_AT_INDEX" To="OpcUaTest.RegisterMoreServices.GET_AT_INDEX"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.S1Reg" To="OpcUaTest.RegisterMoreServices.S1Reg"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.Service2RegisteredPos0" To="OpcUaTest.RegisterMoreServices.Service2RegisteredPos0"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.E_SWITCH" To="OpcUaTest.RegisterMoreServices.E_SWITCH"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.F_EQ_1" To="OpcUaTest.RegisterMoreServices.F_EQ_1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.Service1RegisteredPos0" To="OpcUaTest.RegisterMoreServices.Service1RegisteredPos0"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.Service1NotRegisteredPos1" To="OpcUaTest.RegisterMoreServices.Service1NotRegisteredPos1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.Sequencer" To="OpcUaTest.RegisterMoreServices.Sequencer"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.Service2NotRegisteredPos1" To="OpcUaTest.RegisterMoreServices.Service2NotRegisteredPos1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.F_EQ_1_1" To="OpcUaTest.RegisterMoreServices.F_EQ_1_1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.S2Reg" To="OpcUaTest.RegisterMoreServices.S2Reg"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.E_SWITCH_1" To="OpcUaTest.RegisterMoreServices.E_SWITCH_1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.GET_AT_INDEX_1_1" To="OpcUaTest.RegisterMoreServices.GET_AT_INDEX_1_1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.GetEndpointFromServiceRegistryEntry_1_1" To="OpcUaTest.RegisterMoreServices.GetEndpointFromServiceRegistryEntry_1_1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.GetEndpointFromServiceRegistryEntry_2" To="OpcUaTest.RegisterMoreServices.GetEndpointFromServiceRegistryEntry_2"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.GET_AT_INDEX_2" To="OpcUaTest.RegisterMoreServices.GET_AT_INDEX_2"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.SUBL_0" To="OpcUaTest.RegisterMoreServices.SUBL_0"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.Service1NotRegisteredPos0" To="OpcUaTest.RegisterMoreServices.Service1NotRegisteredPos0"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.F_EQ_3" To="OpcUaTest.RegisterMoreServices.F_EQ_3"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.F_EQ_3_1" To="OpcUaTest.RegisterMoreServices.F_EQ_3_1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.Service2NotRegisteredPos0" To="OpcUaTest.RegisterMoreServices.Service2NotRegisteredPos0"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.Service1" To="OpcUaTest.RegisterMoreServices.Service1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.Service2" To="OpcUaTest.RegisterMoreServices.Service2"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.PUBL_0" To="OpcUaTest.RegisterMoreServices.PUBL_0"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.SUBL_0" To="OpcUaTest.SameServiceTwice.SUBL_0"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.Sequencer" To="OpcUaTest.SameServiceTwice.Sequencer"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.Service1" To="OpcUaTest.SameServiceTwice.Service1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.FieldsToArrowheadSystem" To="OpcUaTest.SameServiceTwice.FieldsToArrowheadSystem"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.GET_AT_INDEX_1" To="OpcUaTest.SameServiceTwice.GET_AT_INDEX_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.GetEndpointFromServiceRegistryEntry" To="OpcUaTest.SameServiceTwice.GetEndpointFromServiceRegistryEntry"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.GET_AT_INDEX" To="OpcUaTest.SameServiceTwice.GET_AT_INDEX"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.GetEndpointFromServiceRegistryEntry_1" To="OpcUaTest.SameServiceTwice.GetEndpointFromServiceRegistryEntry_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.Service1RegisteredPos0" To="OpcUaTest.SameServiceTwice.Service1RegisteredPos0"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_EQ_2" To="OpcUaTest.SameServiceTwice.F_EQ_2"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.BothServicesRegistered" To="OpcUaTest.SameServiceTwice.BothServicesRegistered"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_EQ_3" To="OpcUaTest.SameServiceTwice.F_EQ_3"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_EQ" To="OpcUaTest.SameServiceTwice.F_EQ"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_EQ_2_1" To="OpcUaTest.SameServiceTwice.F_EQ_2_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_EQ_3_1" To="OpcUaTest.SameServiceTwice.F_EQ_3_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.Service2RegisteredPos0" To="OpcUaTest.SameServiceTwice.Service2RegisteredPos0"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_EQ_1" To="OpcUaTest.SameServiceTwice.F_EQ_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.BothServicesNotRegistered" To="OpcUaTest.SameServiceTwice.BothServicesNotRegistered"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_EQ_1_1" To="OpcUaTest.SameServiceTwice.F_EQ_1_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_EQ_1_1_1" To="OpcUaTest.SameServiceTwice.F_EQ_1_1_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.Service2NotRegisteredPos1" To="OpcUaTest.SameServiceTwice.Service2NotRegisteredPos1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_EQ_4" To="OpcUaTest.SameServiceTwice.F_EQ_4"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_EQ_4_1" To="OpcUaTest.SameServiceTwice.F_EQ_4_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.Service1NotRegisteredPos1" To="OpcUaTest.SameServiceTwice.Service1NotRegisteredPos1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_AND" To="OpcUaTest.SameServiceTwice.F_AND"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.E_MERGE" To="OpcUaTest.SameServiceTwice.E_MERGE"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.E_MERGE_1" To="OpcUaTest.SameServiceTwice.E_MERGE_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_AND_1" To="OpcUaTest.SameServiceTwice.F_AND_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_OR" To="OpcUaTest.SameServiceTwice.F_OR"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.F_AND_1_1" To="OpcUaTest.SameServiceTwice.F_AND_1_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.BOOL2BOOL" To="OpcUaTest.SameServiceTwice.BOOL2BOOL"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.BOOL2BOOL_1" To="OpcUaTest.SameServiceTwice.BOOL2BOOL_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.FieldsToArrowheadSystem_1" To="OpcUaTest.SameServiceTwice.FieldsToArrowheadSystem_1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.PUBL_0" To="OpcUaTest.SameServiceTwice.PUBL_0"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.FieldsToArrowheadService" To="OpcUaTest.VersionInterfaceAndMetadata.FieldsToArrowheadService"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GetEndpointFromServiceRegistryEntry" To="OpcUaTest.VersionInterfaceAndMetadata.GetEndpointFromServiceRegistryEntry"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GET_AT_INDEX" To="OpcUaTest.VersionInterfaceAndMetadata.GET_AT_INDEX"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.F_EQ_4" To="OpcUaTest.VersionInterfaceAndMetadata.F_EQ_4"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.LowerVersion" To="OpcUaTest.VersionInterfaceAndMetadata.LowerVersion"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.FieldsToArrowheadService_1" To="OpcUaTest.VersionInterfaceAndMetadata.FieldsToArrowheadService_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.SameVersion" To="OpcUaTest.VersionInterfaceAndMetadata.SameVersion"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GET_AT_INDEX_1" To="OpcUaTest.VersionInterfaceAndMetadata.GET_AT_INDEX_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GetEndpointFromServiceRegistryEntry_1" To="OpcUaTest.VersionInterfaceAndMetadata.GetEndpointFromServiceRegistryEntry_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.F_EQ_4_1" To="OpcUaTest.VersionInterfaceAndMetadata.F_EQ_4_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.OneInterfaceOutOfTwo" To="OpcUaTest.VersionInterfaceAndMetadata.OneInterfaceOutOfTwo"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GetEndpointFromServiceRegistryEntry_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.GetEndpointFromServiceRegistryEntry_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.F_EQ_4_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.F_EQ_4_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.FieldsToArrowheadService_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.FieldsToArrowheadService_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GET_AT_INDEX_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.GET_AT_INDEX_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.OneInterfaceOutOfTwo_2" To="OpcUaTest.VersionInterfaceAndMetadata.OneInterfaceOutOfTwo_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GetEndpointFromServiceRegistryEntry_1_2" To="OpcUaTest.VersionInterfaceAndMetadata.GetEndpointFromServiceRegistryEntry_1_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.F_EQ_4_1_2" To="OpcUaTest.VersionInterfaceAndMetadata.F_EQ_4_1_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.FieldsToArrowheadService_1_2" To="OpcUaTest.VersionInterfaceAndMetadata.FieldsToArrowheadService_1_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GET_AT_INDEX_1_2" To="OpcUaTest.VersionInterfaceAndMetadata.GET_AT_INDEX_1_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.WrongInterface" To="OpcUaTest.VersionInterfaceAndMetadata.WrongInterface"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GET_AT_INDEX_1_2_1" To="OpcUaTest.VersionInterfaceAndMetadata.GET_AT_INDEX_1_2_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GetEndpointFromServiceRegistryEntry_1_2_1" To="OpcUaTest.VersionInterfaceAndMetadata.GetEndpointFromServiceRegistryEntry_1_2_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.FieldsToArrowheadService_1_2_1" To="OpcUaTest.VersionInterfaceAndMetadata.FieldsToArrowheadService_1_2_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.F_EQ_4_1_2_1" To="OpcUaTest.VersionInterfaceAndMetadata.F_EQ_4_1_2_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.SUBL_0" To="OpcUaTest.VersionInterfaceAndMetadata.SUBL_0"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.OnlyOneMetadata" To="OpcUaTest.VersionInterfaceAndMetadata.OnlyOneMetadata"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GetEndpointFromServiceRegistryEntry_1_2_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.GetEndpointFromServiceRegistryEntry_1_2_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.F_EQ_4_1_2_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.F_EQ_4_1_2_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.FieldsToArrowheadService_1_2_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.FieldsToArrowheadService_1_2_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GET_AT_INDEX_1_2_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.GET_AT_INDEX_1_2_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GetEndpointFromServiceRegistryEntry_1_2_1_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.GetEndpointFromServiceRegistryEntry_1_2_1_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.FieldsToArrowheadService_1_2_1_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.FieldsToArrowheadService_1_2_1_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.F_EQ_4_1_2_1_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.F_EQ_4_1_2_1_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GET_AT_INDEX_1_2_1_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.GET_AT_INDEX_1_2_1_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.NoMetadataAndAsked" To="OpcUaTest.VersionInterfaceAndMetadata.NoMetadataAndAsked"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.F_EQ_4_1_2_1_2" To="OpcUaTest.VersionInterfaceAndMetadata.F_EQ_4_1_2_1_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GET_AT_INDEX_1_2_1_2" To="OpcUaTest.VersionInterfaceAndMetadata.GET_AT_INDEX_1_2_1_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.FieldsToArrowheadService_1_2_1_2" To="OpcUaTest.VersionInterfaceAndMetadata.FieldsToArrowheadService_1_2_1_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GetEndpointFromServiceRegistryEntry_1_2_1_2" To="OpcUaTest.VersionInterfaceAndMetadata.GetEndpointFromServiceRegistryEntry_1_2_1_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.NoInterface" To="OpcUaTest.VersionInterfaceAndMetadata.NoInterface"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.GetEndpointFromServiceRegistryEntry_1_2_1_1_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.GET_AT_INDEX_1_2_1_1_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.GET_AT_INDEX_1_2_1_1_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.F_EQ_4_1_2_1_1_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.F_EQ_4_1_2_1_1_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.WrongMetadaButNotAsked" To="OpcUaTest.VersionInterfaceAndMetadata.WrongMetadaButNotAsked"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.FieldsToArrowheadService_1_2_1_1_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.FieldsToArrowheadService_1_2_1_1_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.PUBL_0" To="OpcUaTest.VersionInterfaceAndMetadata.PUBL_0"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.SUBL_0" To="OpcUaTest.RegisterMoreServicesSubApp.SUBL_0"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.GetEndpointFromServiceRegistryEntry_1" To="OpcUaTest.RegisterMoreServicesSubApp.GetEndpointFromServiceRegistryEntry_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.GET_AT_INDEX_1" To="OpcUaTest.RegisterMoreServicesSubApp.GET_AT_INDEX_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.GetEndpointFromServiceRegistryEntry" To="OpcUaTest.RegisterMoreServicesSubApp.GetEndpointFromServiceRegistryEntry"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.FieldsToArrowheadSystem" To="OpcUaTest.RegisterMoreServicesSubApp.FieldsToArrowheadSystem"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.F_EQ_2" To="OpcUaTest.RegisterMoreServicesSubApp.F_EQ_2"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.GET_AT_INDEX" To="OpcUaTest.RegisterMoreServicesSubApp.GET_AT_INDEX"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.Pos1Empty2" To="OpcUaTest.RegisterMoreServicesSubApp.Pos1Empty2"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.F_EQ_1" To="OpcUaTest.RegisterMoreServicesSubApp.F_EQ_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.Pos1Empty" To="OpcUaTest.RegisterMoreServicesSubApp.Pos1Empty"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.Sequencer" To="OpcUaTest.RegisterMoreServicesSubApp.Sequencer"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.GET_AT_INDEX_1_1" To="OpcUaTest.RegisterMoreServicesSubApp.GET_AT_INDEX_1_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.GetEndpointFromServiceRegistryEntry_1_1" To="OpcUaTest.RegisterMoreServicesSubApp.GetEndpointFromServiceRegistryEntry_1_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.GetEndpointFromServiceRegistryEntry_2" To="OpcUaTest.RegisterMoreServicesSubApp.GetEndpointFromServiceRegistryEntry_2"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.GET_AT_INDEX_2" To="OpcUaTest.RegisterMoreServicesSubApp.GET_AT_INDEX_2"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.Pos0Service1" To="OpcUaTest.RegisterMoreServicesSubApp.Pos0Service1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.F_EQ_3" To="OpcUaTest.RegisterMoreServicesSubApp.F_EQ_3"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.F_EQ_3_1" To="OpcUaTest.RegisterMoreServicesSubApp.F_EQ_3_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.Pos0Service2" To="OpcUaTest.RegisterMoreServicesSubApp.Pos0Service2"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.PUBL_0_1" To="OpcUaTest.RegisterMoreServicesSubApp.PUBL_0_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.F_EQ_1_1" To="OpcUaTest.RegisterMoreServicesSubApp.F_EQ_1_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.F_EQ_3_1_1" To="OpcUaTest.RegisterMoreServicesSubApp.F_EQ_3_1_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.Pos1Empty3" To="OpcUaTest.RegisterMoreServicesSubApp.Pos1Empty3"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.Pos0Empty3" To="OpcUaTest.RegisterMoreServicesSubApp.Pos0Empty3"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.F_EQ_1_1_1" To="OpcUaTest.RegisterMoreServicesSubApp.F_EQ_1_1_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.Pos0Empty4" To="OpcUaTest.RegisterMoreServicesSubApp.Pos0Empty4"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.Pos1Empty4" To="OpcUaTest.RegisterMoreServicesSubApp.Pos1Empty4"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.F_EQ_3_1_1_1" To="OpcUaTest.RegisterMoreServicesSubApp.F_EQ_3_1_1_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.E_MERGE" To="OpcUaTest.RegisterMoreServicesSubApp.E_MERGE"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.E_MERGE_1" To="OpcUaTest.RegisterMoreServicesSubApp.E_MERGE_1"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.FieldsToServiceRequestForm" To="OpcUaTest.OrchestratorNoRule.FieldsToServiceRequestForm"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.FieldsToArrowheadSystem" To="OpcUaTest.OrchestratorNoRule.FieldsToArrowheadSystem"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.Service1" To="OpcUaTest.OrchestratorNoRule.Service1"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.GetEndpointFromOrchestrationForm" To="OpcUaTest.OrchestratorNoRule.GetEndpointFromOrchestrationForm"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.F_EQ" To="OpcUaTest.OrchestratorNoRule.F_EQ"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.NoServiceAvailable" To="OpcUaTest.OrchestratorNoRule.NoServiceAvailable"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.E_SR" To="OpcUaTest.OrchestratorNoRule.E_SR"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.SUBL_0" To="OpcUaTest.OrchestratorNoRule.SUBL_0"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.PUBL_0" To="OpcUaTest.OrchestratorNoRule.PUBL_0"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.GET_STRUCT_VALUE1" To="OpcUaTest.OrchestratorNoRule.GET_STRUCT_VALUE1"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.Sequencer_1" To="OpcUaTest.OrchestratorNoRule.Sequencer_1"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.RequestOrchestrationForm" To="OpcUaTest.OrchestratorNoRule.RequestOrchestrationForm"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.FieldsToArrowheadSystem" To="OpcUaTest.OrchestrationWithRules.FieldsToArrowheadSystem"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.Service1" To="OpcUaTest.OrchestrationWithRules.Service1"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.F_EQ" To="OpcUaTest.OrchestrationWithRules.F_EQ"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.NoServiceAvailable" To="OpcUaTest.OrchestrationWithRules.NoServiceAvailable"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.E_SR" To="OpcUaTest.OrchestrationWithRules.E_SR"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.SUBL_0" To="OpcUaTest.OrchestrationWithRules.SUBL_0"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.PUBL_0" To="OpcUaTest.OrchestrationWithRules.PUBL_0"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.Sequencer_1" To="OpcUaTest.OrchestrationWithRules.Sequencer_1"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.F_EQ_1" To="OpcUaTest.OrchestrationWithRules.F_EQ_1"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.ServiceAvailable" To="OpcUaTest.OrchestrationWithRules.ServiceAvailable"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.E_SR_1" To="OpcUaTest.OrchestrationWithRules.E_SR_1"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.E_SWITCH" To="OpcUaTest.OrchestrationWithRules.E_SWITCH"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.FieldsToPublishEvent" To="OpcUaTest.PublishSubscribe.FieldsToPublishEvent"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.FieldsToArrowheadSystem" To="OpcUaTest.PublishSubscribe.FieldsToArrowheadSystem"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.ArrowheadPublish" To="OpcUaTest.PublishSubscribe.ArrowheadPublish"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.PublishEventHTTP" To="OpcUaTest.PublishSubscribe.PublishEventHTTP"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.FieldsToArrowheadEvent" To="OpcUaTest.PublishSubscribe.FieldsToArrowheadEvent"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.FieldsToEventFilter" To="OpcUaTest.PublishSubscribe.FieldsToEventFilter"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.SubscribeEvent" To="OpcUaTest.PublishSubscribe.SubscribeEvent"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.SubscribeEventHTTP" To="OpcUaTest.PublishSubscribe.SubscribeEventHTTP"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.E_CTU" To="OpcUaTest.PublishSubscribe.E_CTU"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.F_EQ" To="OpcUaTest.PublishSubscribe.F_EQ"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.E_DELAY" To="OpcUaTest.PublishSubscribe.E_DELAY"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.NoMessage" To="OpcUaTest.PublishSubscribe.NoMessage"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.F_EQ_1" To="OpcUaTest.PublishSubscribe.F_EQ_1"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.OneMessage" To="OpcUaTest.PublishSubscribe.OneMessage"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.E_DELAY_1" To="OpcUaTest.PublishSubscribe.E_DELAY_1"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.E_DELAY_1_1" To="OpcUaTest.PublishSubscribe.E_DELAY_1_1"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.F_EQ_1_1" To="OpcUaTest.PublishSubscribe.F_EQ_1_1"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.TwoMessages" To="OpcUaTest.PublishSubscribe.TwoMessages"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.Sequencer_1_1" To="OpcUaTest.PublishSubscribe.Sequencer_1_1"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.SUBL_0" To="OpcUaTest.PublishSubscribe.SUBL_0"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.PUBL_0_1" To="OpcUaTest.PublishSubscribe.PUBL_0_1"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.PUBL_0" To="OpcUaTest.PublishSubscribe.PUBL_0"/>
+  <Mapping From="OpcUaTest0CleanALL.RegisterService1" To="OpcUaTest.cleanAll.RegisterService1"/>
+  <Mapping From="OpcUaTest0CleanALL.RegisterService2_1" To="OpcUaTest.cleanAll.RegisterService2_1"/>
+  <Mapping From="OpcUaTest0CleanALL.RegisterService2" To="OpcUaTest.cleanAll.RegisterService2"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.RegisterServiceOpcUa" To="OpcUaTest.RegisterUnregister.RegisterServiceOpcUa"/>
+  <Mapping From="OpcUaTest1RegisterUnregister.QueryServiceOpcUa" To="OpcUaTest.RegisterUnregister.QueryServiceOpcUa"/>
+  <Mapping From="OpcUaTest2DoubleRegister.RegisterServiceOpcUa" To="OpcUaTest.DoubleRegister.RegisterServiceOpcUa"/>
+  <Mapping From="OpcUaTest2DoubleRegister.QueryServiceOpcUa" To="OpcUaTest.DoubleRegister.QueryServiceOpcUa"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.RegisterService2" To="OpcUaTest.RegisterMoreServices.RegisterService2"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.RegisterService1" To="OpcUaTest.RegisterMoreServices.RegisterService1"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.QueryService2" To="OpcUaTest.RegisterMoreServices.QueryService2"/>
+  <Mapping From="OpcUaTest3RegisterMoreServices.QueryService1" To="OpcUaTest.RegisterMoreServices.QueryService1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.RegisterService2" To="OpcUaTest.SameServiceTwice.RegisterService2"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.RegisterService1" To="OpcUaTest.SameServiceTwice.RegisterService1"/>
+  <Mapping From="OpcUaTest4SameServiceTwice.QueryServiceHTTPSub" To="OpcUaTest.SameServiceTwice.QueryServiceHTTPSub"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.RegisterServiceFullHTTP" To="OpcUaTest.VersionInterfaceAndMetadata.RegisterServiceFullHTTP"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.QueryServiceHTTPSub" To="OpcUaTest.VersionInterfaceAndMetadata.QueryServiceHTTPSub"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.QueryServiceHTTPSub_1" To="OpcUaTest.VersionInterfaceAndMetadata.QueryServiceHTTPSub_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.QueryServiceHTTPSub_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.QueryServiceHTTPSub_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.QueryServiceHTTPSub_1_2" To="OpcUaTest.VersionInterfaceAndMetadata.QueryServiceHTTPSub_1_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.QueryServiceHTTPSub_1_2_1_2" To="OpcUaTest.VersionInterfaceAndMetadata.QueryServiceHTTPSub_1_2_1_2"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.QueryServiceHTTPSub_1_2_1" To="OpcUaTest.VersionInterfaceAndMetadata.QueryServiceHTTPSub_1_2_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.QueryServiceHTTPSub_1_2_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.QueryServiceHTTPSub_1_2_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.QueryServiceHTTPSub_1_2_1_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.QueryServiceHTTPSub_1_2_1_1_1"/>
+  <Mapping From="OpcUaTest5VersionAndMetadata.QueryServiceHTTPSub_1_2_1_1_1_1" To="OpcUaTest.VersionInterfaceAndMetadata.QueryServiceHTTPSub_1_2_1_1_1_1"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.RegisterManyServices" To="OpcUaTest.RegisterMoreServicesSubApp.RegisterManyServices"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.QueryFirstService" To="OpcUaTest.RegisterMoreServicesSubApp.QueryFirstService"/>
+  <Mapping From="OpcUaTest6RegisterMoreServiceSubApp.QuerySecondService" To="OpcUaTest.RegisterMoreServicesSubApp.QuerySecondService"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.RequestOrchestrationHTTP" To="OpcUaTest.OrchestratorNoRule.RequestOrchestrationHTTP"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.RegisterService2" To="OpcUaTest.OrchestratorNoRule.RegisterService2"/>
+  <Mapping From="OpcUaTest7OrchestrationNoRules.SERVER_1_1" To="OpcUaTest.OrchestratorNoRule.SERVER_1_1"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.SERVER_1_1" To="OpcUaTest.OrchestrationWithRules.SERVER_1_1"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.RegisterService2" To="OpcUaTest.OrchestrationWithRules.RegisterService2"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.GetEndpointFromOrchestrationHTTPPFull" To="OpcUaTest.OrchestrationWithRules.GetEndpointFromOrchestrationHTTPPFull"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.E_DELAY" To="OpcUaTest.OrchestrationWithRules.E_DELAY"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.E_DELAY_1" To="OpcUaTest.OrchestrationWithRules.E_DELAY_1"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.STRING2STRING_3_1" To="OpcUaTest.OrchestrationWithRules.STRING2STRING_3_1"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.STRING2STRING_3" To="OpcUaTest.OrchestrationWithRules.STRING2STRING_3"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.SERVER_1_0" To="OpcUaTest.PublishSubscribe.SERVER_1_0"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.CLIENT_1_2" To="OpcUaTest.OrchestrationWithRules.CLIENT_1_2"/>
+  <Mapping From="OpcUaTest8OrchestrationWithRules.CLIENT_1_2_1" To="OpcUaTest.OrchestrationWithRules.CLIENT_1_2_1"/>
+  <Mapping From="OpcUaTest9PublishSubscribe.STRING2STRING" To="OpcUaTest.PublishSubscribe.STRING2STRING"/>
 </System>
diff --git a/Arrowhead/FBRT/hmi/CHOICE_TBL.fbt b/Arrowhead/FBRT/hmi/CHOICE_TBL.fbt
new file mode 100644
index 0000000..fada745
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/CHOICE_TBL.fbt
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="CHOICE_TBL" Comment="Table CHOICE input" >
+  <Identification Standard="61499-1" Classification="GUI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-04-07" />
+  <CompilerInfo header="package fb.rt.hmi; import fb.rt.math.*;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Table Initialization" >
+        <With Var="KEYS" />
+        <With Var="VALUES" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+      </Event>
+      <Event Name="IND" Comment="New Choice" >
+        <With Var="VALUE" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="KEYS" Type="WSTRING" Comment="Comma-separated List of Keys" />
+      <VarDeclaration Name="VALUES" Type="WSTRING" Comment="Comma-separated List of Values" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="VALUE" Type="WSTRING" Comment="Value Corresponding to Chosen Key" />
+    </OutputVars>
+  </InterfaceList>
+  <FBNetwork >
+    <FB Name="KEY" Type="IN_CHOICE" x="277.77777" y="11.111111" >
+      <Parameter Name="QI" Value="1" />
+    </FB>
+    <FB Name="TABLE" Type="N_TBL" x="1155.5555" y="122.22221" />
+    <EventConnections>
+      <Connection Source="INIT" Destination="KEY.INIT" dx1="172.22221" />
+      <Connection Source="KEY.INITO" Destination="INITO" dx1="827.7778" />
+      <Connection Source="KEY.IND" Destination="TABLE.REQ" dx1="105.55555" />
+      <Connection Source="TABLE.CNF" Destination="IND" dx1="1527.7777" />
+    </EventConnections>
+    <DataConnections>
+      <Connection Source="KEYS" Destination="KEY.CHOICES" dx1="150.0" />
+      <Connection Source="VALUES" Destination="TABLE.VALUES" dx1="988.88885" />
+      <Connection Source="KEY.I" Destination="TABLE.N" dx1="88.888885" />
+      <Connection Source="TABLE.VALUE" Destination="VALUE" dx1="1577.7777" />
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/COLOR_HUE.fbt b/Arrowhead/FBRT/hmi/COLOR_HUE.fbt
new file mode 100644
index 0000000..6f7acea
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/COLOR_HUE.fbt
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="COLOR_HUE" Comment="Compute Color Hue" >
+  <Identification Standard="61499-1" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2001-06-03" Remarks="XML version" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-01-22" Remarks="SRC version" />
+  <CompilerInfo header="package fb.rt.hmi;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN" Type="COLOR" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="REAL" Comment="Color saturation value" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+  <Algorithm Name="REQ" >
+    <Other Language="JAVA" Text="private float[]hsbvals=new float[3];&#10;&#10;protected void service_REQ(boolean ei){&#10;&#10;java.awt.Color c=IN.value;&#10;&#10;hsbvals=java.awt.Color.RGBtoHSB(c.getRed(),c.getGreen(),c.getBlue(),hsbvals);&#10;&#10;OUT.value=hsbvals[0];&#10;&#10;CNF.serviceEvent(this);&#10;&#10;}&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/COLOR_SAT.fbt b/Arrowhead/FBRT/hmi/COLOR_SAT.fbt
new file mode 100644
index 0000000..ac1cb6c
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/COLOR_SAT.fbt
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="COLOR_SAT" Comment="Compute Color Saturation" >
+  <Identification Standard="61499-1" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2001-06-03" Remarks="XML version" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-01-10" Remarks="SRC version" />
+  <CompilerInfo header="package fb.rt.hmi;" >
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN" Type="COLOR" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="REAL" Comment="Color saturation value" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+  <Algorithm Name="REQ" >
+    <Other Language="JAVA" Text="private float[]hsbvals=new float[3];&#10;protected void service_REQ(boolean ei){&#10;java.awt.Color c=IN.value;&#10;hsbvals=java.awt.Color.RGBtoHSB(c.getRed(),c.getGreen(),c.getBlue(),hsbvals);&#10;OUT.value=hsbvals[1];&#10;CNF.serviceEvent(this);&#10;}&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/CONSOLE.fbt b/Arrowhead/FBRT/hmi/CONSOLE.fbt
new file mode 100644
index 0000000..3052759
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/CONSOLE.fbt
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="CONSOLE" Comment="Output Qualified Event+Data to Console" >
+  <Identification Standard="61499-2" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-04-03" />
+  <CompilerInfo header="package fb.rt.hmi;" >
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization Event" >
+        <With Var="QI" />
+        <With Var="IN" />
+      </Event>
+      <Event Name="REQ" Comment="Request Event" >
+        <With Var="QI" />
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+      </Event>
+      <Event Name="CNF" Comment="Output Confirm" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" />
+      <VarDeclaration Name="IN" Type="WSTRING" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Copy of QI" />
+      <VarDeclaration Name="STATUS" Type="WSTRING" Comment="Copy of IN" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/CTU_OUT.fbt b/Arrowhead/FBRT/hmi/CTU_OUT.fbt
new file mode 100644
index 0000000..00b10e1
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/CTU_OUT.fbt
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="CTU_OUT" Comment="E_CTU with display and label" >
+  <Identification Standard="61499-2" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2004-08-07" />
+  <CompilerInfo header="package fb.rt.swing;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version="1.4.2" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="R" Comment="Reset Counter and Initialize Display" >
+        <With Var="PV" />
+        <With Var="LBL" />
+      </Event>
+      <Event Name="CU" Comment="Count Up" >
+        <With Var="PV" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="RO" Comment="Counter Reset" >
+        <With Var="CV" />
+        <With Var="Q" />
+      </Event>
+      <Event Name="CUO" Comment="Count Up Output Event" >
+        <With Var="CV" />
+        <With Var="Q" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="PV" Type="UINT" Comment="Preset Value" />
+      <VarDeclaration Name="LBL" Type="WSTRING" Comment="Label" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="Q" Type="BOOL" Comment="CV>=PV" />
+      <VarDeclaration Name="CV" Type="UINT" Comment="Counter Value" />
+    </OutputVars>
+  </InterfaceList>
+  <FBNetwork >
+    <FB Name="CTR" Type="E_CTU" x="372.2222" y="11.111111" />
+    <FB Name="OUT" Type="OUT_ANY" x="1044.4445" y="122.22221" >
+      <Parameter Name="IVAL" Value="&#34;0&#34;" />
+      <Parameter Name="TYPE" Value="&#34;UINT&#34;" />
+      <Parameter Name="W" Value="5" />
+    </FB>
+    <FB Name="LABEL" Type="FB_LABEL" x="1605.5555" y="11.111111" />
+    <EventConnections>
+      <Connection Source="CTR.RO" Destination="OUT.INIT" dx1="88.888885" />
+      <Connection Source="CTR.CUO" Destination="OUT.REQ" dx1="211.1111" />
+      <Connection Source="R" Destination="CTR.R" dx1="300.0" />
+      <Connection Source="CU" Destination="CTR.CU" dx1="283.3333" />
+      <Connection Source="OUT.CNF" Destination="CUO" dx1="1466.6666" />
+      <Connection Source="OUT.INITO" Destination="LABEL.INIT" dx1="27.777777" />
+      <Connection Source="LABEL.INITO" Destination="RO" dx1="2005.5554" />
+    </EventConnections>
+    <DataConnections>
+      <Connection Source="CTR.CV" Destination="OUT.IN" dx1="227.77777" />
+      <Connection Source="CTR.CV" Destination="CV" dx1="705.55554" />
+      <Connection Source="PV" Destination="CTR.PV" dx1="283.3333" />
+      <Connection Source="CTR.Q" Destination="Q" dx1="688.88885" />
+      <Connection Source="LBL" Destination="LABEL.LABEL" dx1="1500.0" />
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/DIAG_LOG.fbt b/Arrowhead/FBRT/hmi/DIAG_LOG.fbt
new file mode 100644
index 0000000..d8150df
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/DIAG_LOG.fbt
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="DIAG_LOG" Comment="A diagnostic log with time stamping of conditions,acknowledgments and repair times" >
+  <Identification Standard="61499-1" Classification="HMI" ApplicationDomain="Diagnostics" Function="Tabular log" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2004-06-23" Remarks="Moved to fb.rt.swing, subclassed from FB_TABLE." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-04-14" Remarks="First XML version" />
+  <CompilerInfo header="package fb.rt.swing; " classdef="public class DIAG_LOG extends FB_TABLE" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version="1.4.2" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialize" >
+        <With Var="QI" />
+      </Event>
+      <Event Name="REQ" Comment="Log an event" >
+        <With Var="SRC" />
+        <With Var="COND" />
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="STATUS" />
+        <With Var="QO" />
+      </Event>
+      <Event Name="IND" Comment="REQ Confirmation" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" Comment="Input event qualifier (see FB_TABLE for usage)" />
+      <VarDeclaration Name="SRC" Type="WSTRING" Comment="Source of event being logged" />
+      <VarDeclaration Name="COND" Type="WSTRING" Comment="Condition being logged" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Output qualifier, (see FB_TABLE for usage)" />
+      <VarDeclaration Name="STATUS" Type="UINT" Comment="0=OK,2=TYPE_CONVERSION_ERROR,4=INHIBITED,13=ARRAY_SIZE_ERROR" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/FB_BAR.fbt b/Arrowhead/FBRT/hmi/FB_BAR.fbt
new file mode 100644
index 0000000..85440bc
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/FB_BAR.fbt
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_BAR" Comment="An orientable single bar graph" >
+  <Identification Standard="61499-1" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.3" Author="JHC" Date="2004-08-20" Remarks="Corrected documentation of output." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2004-01-20" Remarks="Corrected documentation of STYLE input." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2000-04-28" Remarks="Added STYLE input" />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version="1.3.1" />
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization Request" >
+        <With Var="FGD" />
+        <With Var="BKGD" />
+        <With Var="W" />
+        <With Var="H" />
+        <With Var="DIR" />
+        <With Var="STYLE" />
+      </Event>
+      <Event Name="REQ" Comment="Update the bar" >
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+      </Event>
+      <Event Name="CNF" Comment="REQ Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN" Type="UINT" Comment="Value to display" />
+      <VarDeclaration Name="FGD" Type="COLOR" InitialValue="red" Comment="Foreground Color" />
+      <VarDeclaration Name="BKGD" Type="COLOR" InitialValue="blue" Comment="Background Color" />
+      <VarDeclaration Name="W" Type="UINT" Comment="Bar width" />
+      <VarDeclaration Name="H" Type="UINT" Comment="Bar height" />
+      <VarDeclaration Name="DIR" Type="UINT" Comment="Orientation:0=L/R,1=T/B,2=R/L,3=B/T" />
+      <VarDeclaration Name="STYLE" Type="UINT" Comment="Style:0=BAR,1=SLIDER" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="UINT" Comment="Displayed value,limited from 0% to 100%" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/FB_LABEL.fbt b/Arrowhead/FBRT/hmi/FB_LABEL.fbt
new file mode 100644
index 0000000..8512587
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/FB_LABEL.fbt
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_LABEL" Comment="GUI label" >
+  <Identification Standard="61499-1" ApplicationDomain="GUI" Function="Label" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI initial value = true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-03-04" Remarks="Updated documentation." />
+  <CompilerInfo header="package fb.rt.hmi; import fb.rt.*; import java.awt.*;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Service Initialization" >
+        <With Var="QI" />
+        <With Var="LABEL" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" />
+      <VarDeclaration Name="LABEL" Type="WSTRING" Comment="Label" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="Label" LeftInterface="FB_LABEL" >
+    <ServiceSequence Name="normal_establishment" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_LABEL" Event="INIT+" Parameters="LABEL" />
+        <OutputPrimitive Interface="Label" Event="setText" Parameters="LABEL" />
+        <OutputPrimitive Interface="FB_LABEL" Event="INITO+" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="normal_termination" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_LABEL" Event="INIT-" />
+        <OutputPrimitive Interface="FB_LABEL" Event="INITO-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/FB_LEDS.fbt b/Arrowhead/FBRT/hmi/FB_LEDS.fbt
new file mode 100644
index 0000000..ff41099
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/FB_LEDS.fbt
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_LEDS" Comment="An orientable array of rectangular LEDs" >
+  <Identification Standard="61499-1" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2003-11-22" Remarks="Derived from FB_BAR." />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization Request" >
+        <With Var="FGD" />
+        <With Var="BKGD" />
+        <With Var="W" />
+        <With Var="H" />
+        <With Var="DIR" />
+        <With Var="N" />
+      </Event>
+      <Event Name="REQ" Comment="Update the bar" >
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+      </Event>
+      <Event Name="CNF" Comment="REQ Confirmation" >
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN" Type="WORD" Comment="Bits to display(up to 16)" />
+      <VarDeclaration Name="FGD" Type="COLOR" InitialValue="yellow" Comment="Foreground Color" />
+      <VarDeclaration Name="BKGD" Type="COLOR" InitialValue="black" Comment="Background Color" />
+      <VarDeclaration Name="W" Type="UINT" InitialValue="100" Comment="Bar width" />
+      <VarDeclaration Name="H" Type="UINT" InitialValue="25" Comment="Bar height" />
+      <VarDeclaration Name="DIR" Type="UINT" Comment="Orientation:0=L/R,1=T/B,2=R/L,3=B/T" />
+      <VarDeclaration Name="N" Type="UINT" InitialValue="1" Comment="Number of bits to display,starting with LSB-Internally limited to 0&#60;N&#60;17" />
+    </InputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/FB_SLIDER.fbt b/Arrowhead/FBRT/hmi/FB_SLIDER.fbt
new file mode 100644
index 0000000..faa231b
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/FB_SLIDER.fbt
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "../LibraryElement.dtd" >
+<FBType Name="FB_SLIDER" Comment="A slider input" >
+  <Identification Standard="61499-1" ApplicationDomain="GUI" Function="Slider input" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2001-03-04" Remarks="Udated documentation." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2000-04-27" Remarks="Corrected IVAL handling." />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*; import java.awt.event.*;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization Request" >
+        <With Var="IVAL" />
+        <With Var="FGD" />
+        <With Var="BKGD" />
+        <With Var="W" />
+        <With Var="H" />
+        <With Var="DIR" />
+      </Event>
+      <Event Name="REQ" Comment="Read the current value" >
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="OUT" />
+      </Event>
+      <Event Name="IND" Comment="REQ Confirmation or change of state" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IVAL" Type="UINT" Comment="Initial slider position" />
+      <VarDeclaration Name="FGD" Type="COLOR" InitialValue="red" Comment="Foreground Color" />
+      <VarDeclaration Name="BKGD" Type="COLOR" InitialValue="blue" Comment="Background Color" />
+      <VarDeclaration Name="W" Type="UINT" InitialValue="75" Comment="Bar width" />
+      <VarDeclaration Name="H" Type="UINT" InitialValue="20" Comment="Bar height" />
+      <VarDeclaration Name="DIR" Type="UINT" Comment="Orientation:0=L/R,1=T/B,2=R/L,3=B/T" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="UINT" Comment="Slider position{0..100}" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="component" LeftInterface="FB_SLIDER" >
+    <ServiceSequence Name="initialization" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_SLIDER" Event="INIT" Parameters="IVAL,FGD,BKGD,W,H,DIR" />
+        <OutputPrimitive Interface="component" Event="init" />
+        <OutputPrimitive Interface="FB_SLIDER" Event="INITO" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="read_value" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_SLIDER" Event="REQ" />
+        <OutputPrimitive Interface="component" Event="getValue" />
+        <OutputPrimitive Interface="FB_SLIDER" Event="CNF" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="update" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="component" Event="mouseEvent" />
+        <OutputPrimitive Interface="FB_SLIDER" Event="IND" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/FB_TABLE.fbt b/Arrowhead/FBRT/hmi/FB_TABLE.fbt
new file mode 100644
index 0000000..79a7991
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/FB_TABLE.fbt
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_TABLE" Comment="Abstract superclass for HMI elements containing a table." >
+  <Identification Standard="61499-2" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2004-06-22" />
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialize matrix to IN" >
+        <With Var="QI" />
+        <With Var="ROWS" />
+        <With Var="COLS" />
+        <With Var="IVAL" />
+      </Event>
+      <Event Name="REQ" Comment="Set table values(for table outputs only)" >
+        <With Var="QI" />
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="IND" Comment="Confirmation of REQ(for table outputs)or user inputs(for table inputs)" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" Comment="1=Enabled,0=Inhibited" />
+      <VarDeclaration Name="ROWS" Type="UINT" InitialValue="1" Comment="Number of rows in the table" />
+      <VarDeclaration Name="COLS" Type="UINT" InitialValue="1" Comment="Number of columns in the table" />
+      <VarDeclaration Name="IVAL" Type="WSTRING" Comment="Initialization string(subclass-dependent)" />
+      <VarDeclaration Name="IN" Type="ANY" Comment="Data to update table(implementation-dependent)" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="0=OK,1=Inhibited" />
+      <VarDeclaration Name="STATUS" Type="UINT" Comment="0=OK,2=TYPE_CONVERSION_ERROR,4=INHIBITED,13=ARRAY_SIZE_ERROR" />
+      <VarDeclaration Name="OUT" Type="ANY" Comment="Output data from table(implementation-dependent)" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="table" LeftInterface="FB_TABLE" >
+    <ServiceSequence Name="normal_initialization" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_TABLE" Event="INIT+" Parameters="ROWS,COLS,IVAL" />
+        <OutputPrimitive Interface="table" Event="initialize" />
+        <OutputPrimitive Interface="FB_TABLE" Event="INITO+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="unsuccessful_initialization" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_TABLE" Event="INIT+" Parameters="ROWS,COLS,IVAL" />
+        <OutputPrimitive Interface="table" Event="initialize" />
+        <OutputPrimitive Interface="FB_TABLE" Event="INITO-" Parameters="STATUS" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="initialization_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_TABLE" Event="INIT-" />
+        <OutputPrimitive Interface="FB_TABLE" Event="INITO-" Parameters="STATUS" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_TABLE" Event="REQ+" Parameters="IN" />
+        <OutputPrimitive Interface="table" Event="update" />
+        <OutputPrimitive Interface="FB_TABLE" Event="IND+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_TABLE" Event="REQ-" />
+        <OutputPrimitive Interface="FB_TABLE" Event="IND-" Parameters="STATUS" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="table_not_initialized" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_TABLE" Event="REQ+" Parameters="IN" />
+        <OutputPrimitive Interface="FB_TABLE" Event="IND-" Parameters="STATUS" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_error" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_TABLE" Event="REQ+" Parameters="IN" />
+        <OutputPrimitive Interface="table" Event="request" />
+        <OutputPrimitive Interface="FB_TABLE" Event="CNF-" Parameters="STATUS" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="user_input" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="table" Event="setValue" />
+        <OutputPrimitive Interface="FB_TABLE" Event="IND+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="user_input_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="table" Event="setValue" Parameters="QI=FALSE" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="user_input_error" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="table" Event="setValue" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_ANY.fbt b/Arrowhead/FBRT/hmi/IN_ANY.fbt
new file mode 100644
index 0000000..1819895
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_ANY.fbt
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_ANY" Comment="Data input from TextField" >
+  <Identification Standard="61499-1" Classification="GUI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI initial value = true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-05-31" />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" >
+        <With Var="QI" />
+        <With Var="W" />
+        <With Var="TYPE" />
+        <With Var="IVAL" />
+      </Event>
+      <Event Name="REQ" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="IND" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" />
+      <VarDeclaration Name="W" Type="UINT" InitialValue="10" Comment="TextField width in chars" />
+      <VarDeclaration Name="TYPE" Type="WSTRING" InitialValue="&#34;ANY&#34;" Comment="Data type name" />
+      <VarDeclaration Name="IVAL" Type="WSTRING" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="1=OK,0=Error" />
+      <VarDeclaration Name="OUT" Type="ANY" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="TextField" LeftInterface="IN_ANY" >
+    <ServiceSequence Name="normal_initialization" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_ANY" Event="INIT+" Parameters="IVAL" />
+        <OutputPrimitive Interface="TextField" Event="initialize" Parameters="IVAL" />
+        <OutputPrimitive Interface="OUT" Event="initialize" Parameters="IVAL" />
+        <OutputPrimitive Interface="IN_ANY" Event="INITO+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="initialization_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_ANY" Event="INIT-" />
+        <OutputPrimitive Interface="IN_ANY" Event="INITO-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="data_request" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_ANY" Event="REQ+" />
+        <OutputPrimitive Interface="TextField" Event="getText" />
+        <OutputPrimitive Interface="OUT" Event="initialize" Parameters="text" />
+        <OutputPrimitive Interface="IN_ANY" Event="IND+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="data_request_error" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_ANY" Event="REQ+" />
+        <OutputPrimitive Interface="TextField" Event="getText" />
+        <OutputPrimitive Interface="TextField" Event="setText" Parameters="errorMessage" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="data_request_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_ANY" Event="REQ-" />
+        <OutputPrimitive Interface="IN_ANY" Event="IND-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="user_data_entered" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="TextField" Event="dataEntered" />
+        <OutputPrimitive Interface="OUT" Event="initialize" Parameters="text" />
+        <OutputPrimitive Interface="IN_ANY" Event="IND+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="user_data_error" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="TextField" Event="dataEntered" />
+        <OutputPrimitive Interface="TextField" Event="setText" Parameters="errorMessage" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_ARRAY.fbt b/Arrowhead/FBRT/hmi/IN_ARRAY.fbt
new file mode 100644
index 0000000..68f3646
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_ARRAY.fbt
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_ARRAY" Comment="ARRAY input from TextField-see IN_ANY" >
+  <Identification Standard="61499-1" Classification="GUI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2001-06-01" Remarks="Added W input to subclass from IN_ANY." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-04-19" />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*;" classdef="public class IN_ARRAY extends IN_ANY" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" >
+        <With Var="QI" />
+        <With Var="W" />
+        <With Var="N" />
+        <With Var="TYPE" />
+        <With Var="IVAL" />
+      </Event>
+      <Event Name="REQ" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="IND" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" />
+      <VarDeclaration Name="W" Type="UINT" InitialValue="20" Comment="TextField width in chars" />
+      <VarDeclaration Name="N" Type="UINT" Comment="Number of array elements" />
+      <VarDeclaration Name="TYPE" Type="WSTRING" Comment="Array element type" />
+      <VarDeclaration Name="IVAL" Type="WSTRING" InitialValue="&#34;[]&#34;" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="1=OK,0=Error" />
+      <VarDeclaration Name="OUT" Type="ARRAY" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_BOOL.fbt b/Arrowhead/FBRT/hmi/IN_BOOL.fbt
new file mode 100644
index 0000000..9495aec
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_BOOL.fbt
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_BOOL" Comment="Boolean Input Checkbox" >
+  <Identification Standard="61499-1" Function="HMI" Type="BOOL input" Description="Checkbox" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2004-06-08" Remarks="Corrected documentation (no inhibitions)." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI initial value =true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-03-08" Remarks="First XML version" />
+  <CompilerInfo header="package fb.rt.awt; import java.awt.*; import java.awt.event.*;" classdef="public class IN_BOOL extends FBInstance implements ItemListener" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization" >
+        <With Var="QI" />
+        <With Var="LABEL" />
+        <With Var="IN" />
+      </Event>
+      <Event Name="REQ" Comment="Request" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="CNF" Comment="Service Confirmation" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="IND" Comment="User clicked Checkbox" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" Comment="Event qualifier" />
+      <VarDeclaration Name="LABEL" Type="WSTRING" Comment="Label" />
+      <VarDeclaration Name="IN" Type="BOOL" Comment="Initial value" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Event qualifier" />
+      <VarDeclaration Name="OUT" Type="BOOL" Comment="Output data" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="Checkbox" LeftInterface="IN_BOOL" >
+    <ServiceSequence Name="normal_initialization" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_BOOL" Event="INIT+" Parameters="LABEL,IN" />
+        <OutputPrimitive Interface="Checkbox" Event="setLabel" Parameters="LABEL" />
+        <OutputPrimitive Interface="Checkbox" Event="setState" Parameters="IN" />
+        <OutputPrimitive Interface="IN_BOOL" Event="INITO+" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="initialization_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_BOOL" Event="INIT-" />
+        <OutputPrimitive Interface="IN_BOOL" Event="INITO-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="data_read" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_BOOL" Event="REQ+" />
+        <OutputPrimitive Interface="Checkbox" Event="getState" />
+        <OutputPrimitive Interface="IN_BOOL" Event="CNF+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="user_input" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="Checkbox" Event="itemStateChanged" />
+        <OutputPrimitive Interface="IN_BOOL" Event="IND+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_CHOICE.fbt b/Arrowhead/FBRT/hmi/IN_CHOICE.fbt
new file mode 100644
index 0000000..a49566d
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_CHOICE.fbt
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_CHOICE" Comment="Drop-down WSTRING input" >
+  <Identification Standard="61499-1" Classification="GUI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2001-05-23" Remarks="XML version" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="1998-12-15" Remarks="SRC version" />
+  <CompilerInfo header="package fb.rt.hmi;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization" >
+        <With Var="QI" />
+        <With Var="CHOICES" />
+      </Event>
+      <Event Name="REQ" Comment="Request" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+        <With Var="OUT" />
+        <With Var="I" />
+      </Event>
+      <Event Name="IND" Comment="User changed choice or REQ serviced" >
+        <With Var="QO" />
+        <With Var="OUT" />
+        <With Var="I" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" Comment="Event Qualifier" />
+      <VarDeclaration Name="CHOICES" Type="WSTRING" Comment="Comma-separated list of choices" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Event Qualifier" />
+      <VarDeclaration Name="OUT" Type="WSTRING" Comment="Current Selection" />
+      <VarDeclaration Name="I" Type="UINT" Comment="Index of Current Selection" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_COLOR.fbt b/Arrowhead/FBRT/hmi/IN_COLOR.fbt
new file mode 100644
index 0000000..1f19722
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_COLOR.fbt
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_COLOR" Comment="COLOR input from drop-down list" >
+  <Identification Standard="61499-1" ApplicationDomain="GUI" Function="COLOR input" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2001-03-04" Remarks="Updated documentation." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="1998-12-29" Remarks="SRC version" />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*; import java.awt.event.*;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization" >
+        <With Var="QI" />
+      </Event>
+      <Event Name="REQ" Comment="Request" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="IND" Comment="User Entered Data or REQ was processed" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" Comment="1=Read or Init data;0=Inhibit" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="1=OK,0=Error" />
+      <VarDeclaration Name="OUT" Type="COLOR" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="Choice" LeftInterface="IN_COLOR" >
+    <ServiceSequence Name="normal_establishment" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_COLOR" Event="INIT+" />
+        <OutputPrimitive Interface="Choice" Event="initialize" />
+        <OutputPrimitive Interface="IN_COLOR" Event="INITO+" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="normal_termination" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_COLOR" Event="INIT-" />
+        <OutputPrimitive Interface="IN_COLOR" Event="INITO-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="normal_operation" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="Choice" Event="itemStateChanged" />
+        <OutputPrimitive Interface="IN_COLOR" Event="IND+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="operation_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="Choice" Event="itemStateChanged" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_ENUM.fbt b/Arrowhead/FBRT/hmi/IN_ENUM.fbt
new file mode 100644
index 0000000..af9e3c2
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_ENUM.fbt
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_ENUM" Comment="Enumerated data input from drop-down list" >
+  <Identification Standard="61499-1" Classification="GUI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.3" Author="JHC" Date="2004-06-21" Remarks="Made composite, Swing implementation." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2001-06-08" Remarks="XML version, concrete" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="1998-11-20" Remarks="Original (Java) version, abstract" />
+  <CompilerInfo header="package fb.rt.swing;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version="1.4.2" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" >
+        <With Var="QI" />
+        <With Var="TYPE" />
+      </Event>
+      <Event Name="REQ" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="IND" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" />
+      <VarDeclaration Name="TYPE" Type="WSTRING" InitialValue="&#34;ANY&#34;" Comment="Data type name,must be enumerated type" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="1=OK,0=Error" />
+      <VarDeclaration Name="OUT" Type="ANY" />
+    </OutputVars>
+  </InterfaceList>
+  <FBNetwork >
+    <FB Name="CHOICE" Type="IN_CHOICE" x="1083.3333" y="11.111111" />
+    <FB Name="CTL" Type="IN_ENUM_CTL" x="249.99998" y="11.111111" />
+    <EventConnections>
+      <Connection Source="INIT" Destination="CTL.INIT" dx1="144.44444" />
+      <Connection Source="CTL.INITO" Destination="CHOICE.INIT" dx1="55.555553" />
+      <Connection Source="CHOICE.INITO" Destination="INITO" dx1="1633.3333" />
+      <Connection Source="REQ" Destination="CHOICE.REQ" dx1="972.22217" />
+      <Connection Source="CHOICE.IND" Destination="CTL.REQ" dx1="205.55554" dx2="166.66666" dy="750.0" />
+      <Connection Source="CTL.CNF" Destination="IND" dx1="800.0" />
+    </EventConnections>
+    <DataConnections>
+      <Connection Source="QI" Destination="CTL.QI" dx1="166.66666" />
+      <Connection Source="QI" Destination="CHOICE.QI" dx1="999.99994" />
+      <Connection Source="CHOICE.QO" Destination="QO" dx1="1600.0" />
+      <Connection Source="TYPE" Destination="CTL.TYPE" dx1="122.22221" />
+      <Connection Source="CTL.CHOICES" Destination="CHOICE.CHOICES" dx1="266.66666" />
+      <Connection Source="CHOICE.I" Destination="CTL.I" dx1="44.444443" dx2="44.444443" dy="127.77777" />
+      <Connection Source="CTL.OUT" Destination="OUT" dx1="816.6666" />
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_ENUM_CTL.fbt b/Arrowhead/FBRT/hmi/IN_ENUM_CTL.fbt
new file mode 100644
index 0000000..6331c0e
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_ENUM_CTL.fbt
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_ENUM_CTL" Comment="Control block for IN_ENUM" >
+  <Identification Standard="61499-2" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2004-06-21" />
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Service Initialization" >
+        <With Var="QI" />
+        <With Var="TYPE" />
+      </Event>
+      <Event Name="REQ" Comment="Service Request" >
+        <With Var="QI" />
+        <With Var="I" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+        <With Var="CHOICES" />
+      </Event>
+      <Event Name="CNF" Comment="Confirmation of Requested Service" >
+        <With Var="QO" />
+        <With Var="CHOICES" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" Comment="Event Input Qualifier" />
+      <VarDeclaration Name="TYPE" Type="WSTRING" Comment="Enumerated Type Name" />
+      <VarDeclaration Name="I" Type="UINT" Comment="Current enumerated index" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Event Output Qualifier" />
+      <VarDeclaration Name="CHOICES" Type="WSTRING" Comment="Comma-separated enumeration namelist" />
+      <VarDeclaration Name="OUT" Type="ANY" Comment="Enumerated variable with selected value" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_EVENT.fbt b/Arrowhead/FBRT/hmi/IN_EVENT.fbt
new file mode 100644
index 0000000..d24dcfe
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_EVENT.fbt
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_EVENT" Comment="Event-issuing push button" >
+  <Identification Standard="61499-2" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-03-04" Remarks="Updated documentation." />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*; import java.awt.event.*;" classdef="public class IN_EVENT extends FBInstance implements ActionListener" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Service Initialization" >
+        <With Var="QI" />
+        <With Var="LABEL" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+      </Event>
+      <Event Name="IND" Comment="Event Indication" >
+        <With Var="QO" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" />
+      <VarDeclaration Name="LABEL" Type="WSTRING" Comment="Label" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="Button" LeftInterface="FB_BUTTON" >
+    <ServiceSequence Name="normal_establishment" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_BUTTON" Event="INIT+" Parameters="LABEL" />
+        <OutputPrimitive Interface="Button" Event="setLabel" Parameters="LABEL" />
+        <OutputPrimitive Interface="FB_BUTTON" Event="INITO+" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="normal_termination" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="FB_BUTTON" Event="INIT-" />
+        <OutputPrimitive Interface="FB_BUTTON" Event="INITO-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="normal_operation" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="Button" Event="actionPerformed" Parameters="QI=1" />
+        <OutputPrimitive Interface="FB_BUTTON" Event="IND+" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="operation_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="Button" Event="actionPerformed" Parameters="QI=0" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_MATRIX.fbt b/Arrowhead/FBRT/hmi/IN_MATRIX.fbt
new file mode 100644
index 0000000..083cfd4
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_MATRIX.fbt
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_MATRIX" Comment="MATRIX input from table" >
+  <Identification Standard="61499-2" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2004-06-22" />
+  <CompilerInfo header="package fb.rt.swing;" classdef="public class IN_MATRIX extends FB_TABLE" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version="1.4.2" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialize matrix to IN" >
+        <With Var="QI" />
+        <With Var="ROWS" />
+        <With Var="COLS" />
+        <With Var="IVAL" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="IND" Comment="Indication of user input from table" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" Comment="1=Enabled,0=Inhibited" />
+      <VarDeclaration Name="ROWS" Type="UINT" InitialValue="1" Comment="Number of rows in the table" />
+      <VarDeclaration Name="COLS" Type="UINT" InitialValue="1" Comment="Number of columns in the table" />
+      <VarDeclaration Name="IVAL" Type="WSTRING" Comment="Initial data values, e.g., &#34;[1,2,3,4]&#34;" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="0=OK,1=Inhibited" />
+      <VarDeclaration Name="STATUS" Type="UINT" Comment="0=OK,2=TYPE_CONVERSION_ERROR,4=INHIBITED,13=ARRAY_SIZE_ERROR" />
+      <VarDeclaration Name="OUT" Type="ANY" Comment="Output data from table(implementation-dependent)" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_TEXT.fbt b/Arrowhead/FBRT/hmi/IN_TEXT.fbt
new file mode 100644
index 0000000..8f2c4d7
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_TEXT.fbt
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_TEXT" Comment="WSTRING input from TextArea" >
+  <Identification Standard="61499-1" Classification="GUI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.3" Author="JHC" Date="2004-06-20" Remarks="Changed semantics of REQ- to clear()." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2001-11-26" Remarks="Changed ROWS,COLS to SIZE." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-10-09" Remarks="Copied/Modified from IN_ANY" />
+  <CompilerInfo header="package fb.rt.hmi.*;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+    <Compiler Language="Java" Vendor="IBM" Product="Jikes" Version="1.0.6" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" >
+        <With Var="QI" />
+        <With Var="SIZE" />
+        <With Var="IVAL" />
+      </Event>
+      <Event Name="REQ" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="CNF" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" />
+      <VarDeclaration Name="SIZE" Type="UINT" ArraySize="2" InitialValue="[10,50]" Comment="[rows,columns]" />
+      <VarDeclaration Name="IVAL" Type="WSTRING" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="1=OK,0=Error" />
+      <VarDeclaration Name="OUT" Type="WSTRING" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="TextArea" LeftInterface="IN_TEXT" >
+    <ServiceSequence Name="normal_initialization" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_TEXT" Event="INIT+" Parameters="IVAL" />
+        <OutputPrimitive Interface="TextArea" Event="initialize" Parameters="IVAL" />
+        <OutputPrimitive Interface="IN_TEXT" Event="INITO+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="initialization_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_TEXT" Event="INIT-" />
+        <OutputPrimitive Interface="IN_TEXT" Event="INITO-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="data_request" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_TEXT" Event="REQ+" />
+        <OutputPrimitive Interface="TextArea" Event="getText" />
+        <OutputPrimitive Interface="IN_TEXT" Event="CNF+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="not_initialized" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_TEXT" Event="REQ+" />
+        <OutputPrimitive Interface="IN_TEXT" Event="CNF-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="clear" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="IN_TEXT" Event="REQ-" />
+        <OutputPrimitive Interface="TextArea" Event="clear" />
+        <OutputPrimitive Interface="IN_TEXT" Event="CNF-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/IN_TEXT_S.fbt b/Arrowhead/FBRT/hmi/IN_TEXT_S.fbt
new file mode 100644
index 0000000..96cb7bf
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/IN_TEXT_S.fbt
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="IN_TEXT_S" Comment="STRING input from TextArea-see IN_TEXT" >
+  <Identification Standard="61499-1" Classification="GUI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2001-11-26" Remarks="Copied/Modified from IN_TEXT." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-10-09" Remarks="Copied/Modified from IN_ANY" />
+  <CompilerInfo header="package fb.rt.hmi.*;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+    <Compiler Language="Java" Vendor="IBM" Product="Jikes" Version="1.0.6" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" >
+        <With Var="QI" />
+        <With Var="SIZE" />
+        <With Var="IVAL" />
+      </Event>
+      <Event Name="REQ" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="CNF" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" />
+      <VarDeclaration Name="SIZE" Type="UINT" ArraySize="2" InitialValue="[10,50]" Comment="[rows,columns]" />
+      <VarDeclaration Name="IVAL" Type="WSTRING" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="1=OK,0=Error" />
+      <VarDeclaration Name="OUT" Type="STRING" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/OUT_ANY.fbt b/Arrowhead/FBRT/hmi/OUT_ANY.fbt
new file mode 100644
index 0000000..fadff0d
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/OUT_ANY.fbt
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="OUT_ANY" Comment="Data output to TextField" >
+  <Identification Standard="61499-1" Classification="GUI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-05-31" />
+  <CompilerInfo header="package fb.rt.hmi;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization" >
+        <With Var="QI" />
+        <With Var="W" />
+        <With Var="TYPE" />
+        <With Var="IVAL" />
+      </Event>
+      <Event Name="REQ" Comment="Request" >
+        <With Var="QI" />
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+      </Event>
+      <Event Name="CNF" Comment="Service Confirmation" >
+        <With Var="QO" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" Comment="Input event qualifier" />
+      <VarDeclaration Name="IN" Type="ANY" Comment="Output value to convert" />
+      <VarDeclaration Name="W" Type="UINT" InitialValue="10" Comment="TextField width in chars" />
+      <VarDeclaration Name="TYPE" Type="WSTRING" InitialValue="&#34;ANY&#34;" Comment="Data type name" />
+      <VarDeclaration Name="IVAL" Type="WSTRING" Comment="Initial value" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Output event qualifier" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="TextField" LeftInterface="OUT_ANY" >
+    <ServiceSequence Name="normal_initialization" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_ANY" Event="INIT+" Parameters="IVAL" />
+        <OutputPrimitive Interface="TextField" Event="initialize" Parameters="IVAL" />
+        <OutputPrimitive Interface="OUT_ANY" Event="INITO+" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="initialization_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_ANY" Event="INIT-" />
+        <OutputPrimitive Interface="OUT_ANY" Event="INITO-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="normal_data_transfer" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_ANY" Event="REQ+" Parameters="IN" />
+        <OutputPrimitive Interface="TextField" Event="setText" Parameters="IN" />
+        <OutputPrimitive Interface="OUT_ANY" Event="CNF+" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="data_transfer_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_ANY" Event="REQ-" />
+        <OutputPrimitive Interface="OUT_ANY" Event="CNF-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/OUT_ARRAY.fbt b/Arrowhead/FBRT/hmi/OUT_ARRAY.fbt
new file mode 100644
index 0000000..4dcc8a8
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/OUT_ARRAY.fbt
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="OUT_ARRAY" Comment="ARRAY Output to TextField" >
+  <Identification Standard="61499-1" Classification="GUI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.3" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2001-06-01" Remarks="Added W input to subclass from OUT_ANY." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2001-05-27" Remarks="XML version with N,TYPE inputs" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="1998-12-30" Remarks="Original SRC version" />
+  <CompilerInfo header="package fb.rt.net;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization" >
+        <With Var="QI" />
+        <With Var="W" />
+        <With Var="N" />
+        <With Var="TYPE" />
+        <With Var="IVAL" />
+      </Event>
+      <Event Name="REQ" Comment="Request" >
+        <With Var="QI" />
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+      </Event>
+      <Event Name="CNF" Comment="Service Confirmation" >
+        <With Var="QO" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" Comment="Input event qualifier" />
+      <VarDeclaration Name="IN" Type="ARRAY" Comment="Output value" />
+      <VarDeclaration Name="W" Type="UINT" InitialValue="20" Comment="TextField width in chars" />
+      <VarDeclaration Name="N" Type="UINT" Comment="Number of array elements" />
+      <VarDeclaration Name="TYPE" Type="WSTRING" Comment="Array element type" />
+      <VarDeclaration Name="IVAL" Type="WSTRING" Comment="Initial contents" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Output event qualifier" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/OUT_BOOL.fbt b/Arrowhead/FBRT/hmi/OUT_BOOL.fbt
new file mode 100644
index 0000000..cf02b8a
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/OUT_BOOL.fbt
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="OUT_BOOL" Comment="Boolean Output Color Box" >
+  <Identification Standard="61499-1" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-04-14" Remarks="First XML version." />
+  <CompilerInfo header="package fb.rt.hmi;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization" >
+        <With Var="QI" />
+        <With Var="LABEL" />
+        <With Var="IN" />
+        <With Var="C0" />
+        <With Var="C1" />
+      </Event>
+      <Event Name="REQ" Comment="Request" >
+        <With Var="QI" />
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+      </Event>
+      <Event Name="CNF" Comment="Service Confirmation" >
+        <With Var="QO" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" Comment="Event qualifier" />
+      <VarDeclaration Name="LABEL" Type="WSTRING" Comment="Label" />
+      <VarDeclaration Name="IN" Type="BOOL" Comment="Input value" />
+      <VarDeclaration Name="C0" Type="COLOR" InitialValue="COLOR#white" Comment="Color when IN=0" />
+      <VarDeclaration Name="C1" Type="COLOR" InitialValue="COLOR#green" Comment="Color when IN=1" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Event qualifier" />
+    </OutputVars>
+  </InterfaceList>
+  <FBNetwork >
+    <FB Name="SEL" Type="FB_SEL_COLOR" x="241.1765" y="11.7647" />
+    <FB Name="BOX" Type="OUT_COLOR" x="1088.2352" y="11.7647" />
+    <EventConnections>
+      <Connection Source="INIT" Destination="BOX.INIT" dx1="982.3529" />
+      <Connection Source="BOX.INITO" Destination="INITO" dx1="1617.647" />
+      <Connection Source="REQ" Destination="SEL.REQ" dx1="129.4118" />
+      <Connection Source="SEL.CNF" Destination="BOX.REQ" dx1="76.4706" />
+      <Connection Source="BOX.CNF" Destination="CNF" dx1="1594.1177" />
+    </EventConnections>
+    <DataConnections>
+      <Connection Source="QI" Destination="BOX.QI" dx1="1005.8823" />
+      <Connection Source="BOX.QO" Destination="QO" dx1="1582.3529" />
+      <Connection Source="IN" Destination="SEL.G" dx1="164.7059" />
+      <Connection Source="C0" Destination="SEL.IN0" dx1="158.8235" />
+      <Connection Source="C1" Destination="SEL.IN1" dx1="158.8235" />
+      <Connection Source="LABEL" Destination="BOX.LABEL" dx1="941.1765" />
+      <Connection Source="SEL.OUT" Destination="BOX.IN" dx1="70.5882" />
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/OUT_COLOR.fbt b/Arrowhead/FBRT/hmi/OUT_COLOR.fbt
new file mode 100644
index 0000000..b4cc5a0
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/OUT_COLOR.fbt
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="OUT_COLOR" Comment="COLOR Output" >
+  <Identification Standard="61499-1" Classification="HMI" Function="COLOR output" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-04-14" Remarks="First XML version." />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization" >
+        <With Var="QI" />
+        <With Var="LABEL" />
+        <With Var="IN" />
+      </Event>
+      <Event Name="REQ" Comment="Request" >
+        <With Var="QI" />
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+      </Event>
+      <Event Name="CNF" Comment="Service Confirmation" >
+        <With Var="QO" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" Comment="Input event qualifier" />
+      <VarDeclaration Name="LABEL" Type="WSTRING" Comment="Output label" />
+      <VarDeclaration Name="IN" Type="COLOR" Comment="Output value" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Output event qualifier" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="Canvas" LeftInterface="OUT_COLOR" >
+    <ServiceSequence Name="normal_initialization" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_COLOR" Event="INIT+" Parameters="DIA,IN" />
+        <OutputPrimitive Interface="Canvas" Event="drawOval" />
+        <OutputPrimitive Interface="OUT_COLOR" Event="INITO+" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="initialization_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_COLOR" Event="INIT-" />
+        <OutputPrimitive Interface="OUT_COLOR" Event="INITO-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="normal_data_transfer" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_COLOR" Event="REQ+" Parameters="IN" />
+        <OutputPrimitive Interface="Canvas" Event="drawOval" Parameters="IN" />
+        <OutputPrimitive Interface="OUT_COLOR" Event="CNF+" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="upstream_error" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_COLOR" Event="REQ-" />
+        <OutputPrimitive Interface="OUT_COLOR" Event="CNF-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/OUT_EVENT.fbt b/Arrowhead/FBRT/hmi/OUT_EVENT.fbt
new file mode 100644
index 0000000..3bad014
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/OUT_EVENT.fbt
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="OUT_EVENT" Comment="Event Output Flasher" >
+  <Identification Standard="61499-1" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2001-04-14" Remarks="Saved layout." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-05-01" />
+  <CompilerInfo header="package fb.rt.hmi;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization" >
+        <With Var="QI" />
+        <With Var="LABEL" />
+        <With Var="FLASH" />
+      </Event>
+      <Event Name="REQ" Comment="Request" >
+        <With Var="QI" />
+        <With Var="DT" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+      </Event>
+      <Event Name="CNF" Comment="Service Confirmation" >
+        <With Var="QO" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" Comment="Input event qualifier" />
+      <VarDeclaration Name="DT" Type="TIME" InitialValue="t#500ms" Comment="Flash interval" />
+      <VarDeclaration Name="LABEL" Type="WSTRING" />
+      <VarDeclaration Name="FLASH" Type="COLOR" InitialValue="COLOR#red" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Output event qualifier" />
+    </OutputVars>
+  </InterfaceList>
+  <FBNetwork >
+    <FB Name="DLY" Type="E_DELAY" x="194.1176" y="11.7647" />
+    <FB Name="FF" Type="E_SR" x="788.2353" y="11.7647" />
+    <FB Name="OUT" Type="OUT_BOOL" x="1317.647" y="11.7647" />
+    <FB Name="GATE" Type="E_SWITCH" x="1888.2352" y="588.2353" />
+    <EventConnections>
+      <Connection Source="INIT" Destination="OUT.INIT" dx1="1211.7646" />
+      <Connection Source="OUT.INITO" Destination="INITO" dx1="1805.8823" />
+      <Connection Source="REQ" Destination="DLY.START" dx1="82.3529" />
+      <Connection Source="REQ" Destination="FF.S" dx1="676.4706" />
+      <Connection Source="DLY.EO" Destination="FF.R" dx1="35.2941" dx2="29.4118" dy="-70.5882" />
+      <Connection Source="FF.EO" Destination="OUT.REQ" dx1="58.8235" />
+      <Connection Source="OUT.CNF" Destination="GATE.EI" dx1="164.7059" />
+      <Connection Source="GATE.EO0" Destination="CNF" dx1="2323.5293" />
+    </EventConnections>
+    <DataConnections>
+      <Connection Source="QI" Destination="OUT.QI" dx1="1235.2941" />
+      <Connection Source="OUT.QO" Destination="QO" dx1="1770.5883" />
+      <Connection Source="DT" Destination="DLY.DT" dx1="105.8824" />
+      <Connection Source="FF.Q" Destination="OUT.IN" dx1="64.7059" />
+      <Connection Source="LABEL" Destination="OUT.LABEL" dx1="1170.5883" />
+      <Connection Source="FLASH" Destination="OUT.C1" dx1="1170.5883" />
+      <Connection Source="FF.Q" Destination="GATE.G" dx1="64.7059" />
+    </DataConnections>
+  </FBNetwork>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/OUT_TEXT.fbt b/Arrowhead/FBRT/hmi/OUT_TEXT.fbt
new file mode 100644
index 0000000..570307b
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/OUT_TEXT.fbt
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="OUT_TEXT" Comment="WSTRING Output to a TextArea" >
+  <Identification Standard="61499-2" />
+  <VersionInfo Organization="Unknown" Version="0.0" Author="Unknown" Date="2004-06-20" />
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" >
+        <With Var="QI" />
+        <With Var="IVAL" />
+        <With Var="SIZE" />
+      </Event>
+      <Event Name="REQ" Comment="Append IN to the TextArea" >
+        <With Var="QI" />
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" >
+        <With Var="QO" />
+      </Event>
+      <Event Name="CNF" >
+        <With Var="QO" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" />
+      <VarDeclaration Name="IVAL" Type="WSTRING" />
+      <VarDeclaration Name="SIZE" Type="UINT" ArraySize="2" InitialValue="[10,20]" Comment="Rows,Columns" />
+      <VarDeclaration Name="IN" Type="WSTRING" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="TextArea" LeftInterface="OUT_TEXT" >
+    <ServiceSequence Name="normal_initialization" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_TEXT" Event="INIT+" Parameters="IVAL" />
+        <OutputPrimitive Interface="TextArea" Event="initialize" Parameters="IVAL" />
+        <OutputPrimitive Interface="OUT_TEXT" Event="INITO+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="initialization_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_TEXT" Event="INIT-" />
+        <OutputPrimitive Interface="OUT_TEXT" Event="INITO-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="data_request" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_TEXT" Event="REQ+" Parameters="IN" />
+        <OutputPrimitive Interface="TextArea" Event="append" />
+        <OutputPrimitive Interface="OUT_TEXT" Event="CNF+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="not_initialized" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_TEXT" Event="REQ+" />
+        <OutputPrimitive Interface="OUT_TEXT" Event="CNF-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="clear" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="OUT_TEXT" Event="REQ-" />
+        <OutputPrimitive Interface="TextArea" Event="clear" />
+        <OutputPrimitive Interface="OUT_TEXT" Event="CNF-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/OUT_TEXT_S.fbt b/Arrowhead/FBRT/hmi/OUT_TEXT_S.fbt
new file mode 100644
index 0000000..394c275
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/OUT_TEXT_S.fbt
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="OUT_TEXT_S" Comment="STRING Output to a TextArea-see OUT_TEXT" >
+  <Identification Standard="61499-1" Classification="GUI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-11-26" Remarks="Copied/modified from OUT_TEXT." />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" >
+        <With Var="QI" />
+        <With Var="IVAL" />
+        <With Var="SIZE" />
+      </Event>
+      <Event Name="REQ" Comment="Append IN to the TextArea" >
+        <With Var="QI" />
+        <With Var="IN" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" >
+        <With Var="QO" />
+      </Event>
+      <Event Name="CNF" >
+        <With Var="QO" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" />
+      <VarDeclaration Name="IVAL" Type="WSTRING" />
+      <VarDeclaration Name="SIZE" Type="UINT" ArraySize="2" InitialValue="[10,20]" Comment="Rows,Columns" />
+      <VarDeclaration Name="IN" Type="STRING" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/RADIO_BOOL.fbt b/Arrowhead/FBRT/hmi/RADIO_BOOL.fbt
new file mode 100644
index 0000000..d68ecab
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/RADIO_BOOL.fbt
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="RADIO_BOOL" Comment="Radio Button BOOL Input" >
+  <Identification Standard="61499-1" Classification="HMI" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.3" Author="JHC" Date="2004-06-21" Remarks="Updated documentation (REQ not inhibited)." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2004-06-08" Remarks="Updated documentation (REQ not inhibited)." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-03-03" />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*; import java.awt.event.*;" classdef="public class RADIO_BOOL extends FBInstance implements ItemListener" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version="1.4.2" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Initialization" >
+        <With Var="QI" />
+        <With Var="LABEL1" />
+        <With Var="LABEL0" />
+        <With Var="IN" />
+      </Event>
+      <Event Name="REQ" Comment="Request" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="CNF" Comment="Service Confirmation" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+      <Event Name="IND" Comment="User changed state" >
+        <With Var="QO" />
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" InitialValue="true" Comment="Event qualifier" />
+      <VarDeclaration Name="LABEL1" Type="WSTRING" InitialValue="TRUE" Comment="Label for TRUE state" />
+      <VarDeclaration Name="LABEL0" Type="WSTRING" InitialValue="FALSE" Comment="Label for FALSE state" />
+      <VarDeclaration Name="IN" Type="BOOL" Comment="Initial value" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Event qualifier" />
+      <VarDeclaration Name="OUT" Type="BOOL" Comment="Output data" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="HMI" LeftInterface="RADIO_BOOL" >
+    <ServiceSequence Name="normal_initialization" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="RADIO_BOOL" Event="INIT+" Parameters="LABEL1,LABEL0,IN" />
+        <OutputPrimitive Interface="HMI" Event="initialize" />
+        <OutputPrimitive Interface="RADIO_BOOL" Event="INITO+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="initialization_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="RADIO_BOOL" Event="INIT-" />
+        <OutputPrimitive Interface="RADIO_BOOL" Event="INITO-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="indication" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="HMI" Event="itemStateChanged" Parameters="QI=1" />
+        <OutputPrimitive Interface="RADIO_BOOL" Event="IND+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="indication_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="HMI" Event="itemStateChanged" Parameters="QI=0" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_no_change" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="RADIO_BOOL" Event="REQ+" Parameters="IN" />
+        <OutputPrimitive Interface="HMI" Event="select" />
+        <OutputPrimitive Interface="RADIO_BOOL" Event="CNF+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_selection_change" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="RADIO_BOOL" Event="REQ+" Parameters="IN" />
+        <OutputPrimitive Interface="HMI" Event="select" />
+        <OutputPrimitive Interface="RADIO_BOOL" Event="IND+" Parameters="OUT" />
+        <OutputPrimitive Interface="RADIO_BOOL" Event="CNF+" Parameters="OUT" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_inhibited" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="RADIO_BOOL" Event="REQ-" />
+        <OutputPrimitive Interface="RADIO_BOOL" Event="CNF-" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/STRIP3.fbt b/Arrowhead/FBRT/hmi/STRIP3.fbt
new file mode 100644
index 0000000..b46e3c1
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/STRIP3.fbt
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="STRIP3" Comment="3-Pen Strip Chart Recorder" >
+  <Identification Standard="61499-1" Classification="Service Interface" ApplicationDomain="Human Interface" Function="Recorder" Type="Strip Chart" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2004-09-01" Remarks="Deleted QI, QO, MAX_SCALE, MIN_SCALE; made inputs UINT{0..100}." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2002-05-03" Remarks="Made QI IV=true." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-04-25" />
+  <CompilerInfo header="package fb.rt.hmi;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" >
+        <With Var="COLORS" />
+        <With Var="BKGD" />
+        <With Var="SIZE" />
+        <With Var="DX" />
+      </Event>
+      <Event Name="REQ" >
+        <With Var="PEN1" />
+        <With Var="PEN2" />
+        <With Var="PEN3" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" >
+      </Event>
+      <Event Name="CNF" >
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="PEN1" Type="UINT" Comment="Pen 1 Position, 0-100%" />
+      <VarDeclaration Name="PEN2" Type="UINT" Comment="Pen 2 Position, 0-100%" />
+      <VarDeclaration Name="PEN3" Type="UINT" Comment="Pen 3 Position, 0-100%" />
+      <VarDeclaration Name="COLORS" Type="COLOR" ArraySize="3" InitialValue="[red,yellow,green]" Comment="PEN1,2,3 Colors" />
+      <VarDeclaration Name="BKGD" Type="COLOR" InitialValue="lightGray" Comment="Background Color" />
+      <VarDeclaration Name="SIZE" Type="UINT" ArraySize="2" InitialValue="[200,200]" Comment="Width,Height" />
+      <VarDeclaration Name="DX" Type="UINT" InitialValue="10" Comment="x-increment size" />
+    </InputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/STRIP4.fbt b/Arrowhead/FBRT/hmi/STRIP4.fbt
new file mode 100644
index 0000000..fde30b9
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/STRIP4.fbt
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="STRIP4" Comment="4-Pen Strip Chart Recorder" >
+  <Identification Standard="61499-1" Classification="Service Interface" ApplicationDomain="Human Interface" Function="Recorder" Type="Strip Chart" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2004-09-03" Remarks="Deleted QI, QO, MAX_SCALE, MIN_SCALE; made inputs UINT{0..100}." />
+  <CompilerInfo header="package fb.rt.swing;" classdef="public class STRIP4 extends STRIP3" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" >
+        <With Var="COLORS" />
+        <With Var="BKGD" />
+        <With Var="SIZE" />
+        <With Var="DX" />
+      </Event>
+      <Event Name="REQ" >
+        <With Var="PEN1" />
+        <With Var="PEN2" />
+        <With Var="PEN3" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" >
+      </Event>
+      <Event Name="CNF" >
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="PEN1" Type="UINT" Comment="Pen 1 Position, 0-100%" />
+      <VarDeclaration Name="PEN2" Type="UINT" Comment="Pen 2 Position, 0-100%" />
+      <VarDeclaration Name="PEN3" Type="UINT" Comment="Pen 3 Position, 0-100%" />
+      <VarDeclaration Name="PEN4" Type="UINT" Comment="Pen 4 Position, 0-100%" />
+      <VarDeclaration Name="COLORS" Type="COLOR" ArraySize="4" InitialValue="[red,blue,green,yellow]" Comment="PEN1,2,3,4 Colors" />
+      <VarDeclaration Name="BKGD" Type="COLOR" InitialValue="lightGray" Comment="Background Color" />
+      <VarDeclaration Name="SIZE" Type="UINT" ArraySize="2" InitialValue="[200,200]" Comment="Width,Height" />
+      <VarDeclaration Name="DX" Type="UINT" InitialValue="10" Comment="x-increment size" />
+    </InputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/hmi/TESTER.fbt b/Arrowhead/FBRT/hmi/TESTER.fbt
new file mode 100644
index 0000000..373d697
--- /dev/null
+++ b/Arrowhead/FBRT/hmi/TESTER.fbt
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "../LibraryElement.dtd" >
+<FBType Name="TESTER" Comment="Test wrapper for IEC 61131-3 FBs" >
+  <Identification Standard="61499-1" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-02-13" Remarks="Replacement for lost source" />
+  <CompilerInfo header="package fb.rt.hmi;" >
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="QO" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" Comment="Input event qualifier" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Output event qualifier" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_ADD_DINT.fbt b/Arrowhead/FBRT/math/FB_ADD_DINT.fbt
new file mode 100644
index 0000000..d779fa5
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_ADD_DINT.fbt
@@ -0,0 +1,42 @@
+<FBType Name="FB_ADD_DINT" Comment="Adds two DINT values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="ADDER" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="DINT" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="DINT" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="DINT" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1+IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_ADD_INT.fbt b/Arrowhead/FBRT/math/FB_ADD_INT.fbt
new file mode 100644
index 0000000..f6a0691
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_ADD_INT.fbt
@@ -0,0 +1,42 @@
+<FBType Name="FB_ADD_INT" Comment="Adds two INT values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="ADDER" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="INT" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="INT" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="INT" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1+IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_ADD_LREAL.fbt b/Arrowhead/FBRT/math/FB_ADD_LREAL.fbt
new file mode 100644
index 0000000..78adebc
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_ADD_LREAL.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_ADD_LREAL" Comment="Adds two LREAL values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="ADDER" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="LREAL" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="LREAL" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="LREAL" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1+IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_ADD_REAL.fbt b/Arrowhead/FBRT/math/FB_ADD_REAL.fbt
new file mode 100644
index 0000000..6224a50
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_ADD_REAL.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_ADD_REAL" Comment="Adds two REAL values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="ADDER" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="REAL" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="REAL" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="REAL" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1+IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_DIV_DINT.fbt b/Arrowhead/FBRT/math/FB_DIV_DINT.fbt
new file mode 100644
index 0000000..597adb0
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_DIV_DINT.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_DIV_DINT" Comment="Divides two DINIT values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="DIVIDER" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="DINT" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="DINT" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="DINT" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1/IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_DIV_INT.fbt b/Arrowhead/FBRT/math/FB_DIV_INT.fbt
new file mode 100644
index 0000000..13aa330
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_DIV_INT.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_DIV_INT" Comment="Divides two INIT values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="DIVIDER" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="INT" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="INT" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="INT" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1/IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_DIV_LREAL.fbt b/Arrowhead/FBRT/math/FB_DIV_LREAL.fbt
new file mode 100644
index 0000000..0e7dfee
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_DIV_LREAL.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_DIV_LREAL" Comment="Divides two LREAL values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="DIVIDER" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="LREAL" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="LREAL" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="LREAL" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1/IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_DIV_REAL.fbt b/Arrowhead/FBRT/math/FB_DIV_REAL.fbt
new file mode 100644
index 0000000..04bfcf4
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_DIV_REAL.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_DIV_REAL" Comment="Divides two REAL values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="DIVIDER" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="REAL" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="REAL" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="REAL" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1/IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_MUL_DINT.fbt b/Arrowhead/FBRT/math/FB_MUL_DINT.fbt
new file mode 100644
index 0000000..5b80537
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_MUL_DINT.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_MUL_DINT" Comment="Multiplies two DINT values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="MULTIPLICATOR" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="DINT" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="DINT" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="DINT" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1*IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_MUL_INT.fbt b/Arrowhead/FBRT/math/FB_MUL_INT.fbt
new file mode 100644
index 0000000..cd1870f
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_MUL_INT.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_MUL_INT" Comment="Multiplies two INT values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="MULTIPLICATOR" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="INT" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="INT" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="INT" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1*IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_MUL_LREAL.fbt b/Arrowhead/FBRT/math/FB_MUL_LREAL.fbt
new file mode 100644
index 0000000..a0f2f8a
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_MUL_LREAL.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_MUL_LREAL" Comment="Multiplies two LREAL values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="MULTIPLICATOR" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="LREAL" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="LREAL" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="LREAL" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1*IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_MUL_REAL.fbt b/Arrowhead/FBRT/math/FB_MUL_REAL.fbt
new file mode 100644
index 0000000..3edce91
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_MUL_REAL.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_MUL_REAL" Comment="Multiplies two REAL values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="MULTIPLICATOR" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="REAL" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="REAL" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="REAL" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1*IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_SEL_COLOR.fbt b/Arrowhead/FBRT/math/FB_SEL_COLOR.fbt
new file mode 100644
index 0000000..e438757
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_SEL_COLOR.fbt
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_SEL_COLOR" Comment="COLOR Selection" >
+  <Identification Standard="61499-1" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2004-06-21" Remarks="Moved from hmi to math." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-04-05" Remarks="First XML version." />
+  <CompilerInfo header="package fb.rt.math;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version="1.4.2" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" >
+        <With Var="G" />
+        <With Var="IN0" />
+        <With Var="IN1" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="G" Type="BOOL" Comment="Selector" />
+      <VarDeclaration Name="IN0" Type="COLOR" Comment="Selected when G=0" />
+      <VarDeclaration Name="IN1" Type="COLOR" Comment="Selected when G=1" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="COLOR" Comment="Selected value" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+  <Algorithm Name="REQ" >
+    <Other Language="JAVA" Text="public void service_REQ(boolean qi){&#10;OUT.value=G.value?IN1.value:IN0.value;}&#10;CNF.serviceEvent(this);}&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_SUB_DINT.fbt b/Arrowhead/FBRT/math/FB_SUB_DINT.fbt
new file mode 100644
index 0000000..a9bbee7
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_SUB_DINT.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_SUB_DINT" Comment="Subtracts two DINT values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="SUBTRACTOR" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="DINT" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="DINT" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="DINT" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1-IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_SUB_INT.fbt b/Arrowhead/FBRT/math/FB_SUB_INT.fbt
new file mode 100644
index 0000000..3e8d97e
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_SUB_INT.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_SUB_INT" Comment="Subtracts two INT values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="SUBTRACTOR" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="INT" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="INT" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="INT" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1-IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_SUB_LREAL.fbt b/Arrowhead/FBRT/math/FB_SUB_LREAL.fbt
new file mode 100644
index 0000000..554d15f
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_SUB_LREAL.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_SUB_LREAL" Comment="Subtracts two LREAL values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="SUBTRACTOR" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="LREAL" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="LREAL" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="LREAL" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1-IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/FB_SUB_REAL.fbt b/Arrowhead/FBRT/math/FB_SUB_REAL.fbt
new file mode 100644
index 0000000..eb5782f
--- /dev/null
+++ b/Arrowhead/FBRT/math/FB_SUB_REAL.fbt
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="FB_SUB_REAL" Comment="Subtracts two REAL values" >
+  <Identification Standard="61499-1" Classification="Mathematic" Function="SUBTRACTOR" Type="Mathematical function" />
+  <VersionInfo Organization="PROFACTOR GmbH" Version="1.0" Author="TS" Date="2007-06-26" />
+  <CompilerInfo header="package fb.rt.mathnew;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version=">1.3" />
+    <Compiler Language="Cpp" Vendor="GNU" Product="GCC" Version=">3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Normal Execution Request" >
+        <With Var="IN1" />
+        <With Var="IN2" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Execution Confirmation" >
+        <With Var="OUT" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="IN1" Type="REAL" Comment="First funtion input" />
+      <VarDeclaration Name="IN2" Type="REAL" Comment="Second function input" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="OUT" Type="REAL" Comment="Function output" />
+    </OutputVars>
+  </InterfaceList>
+  <BasicFB>
+    <ECC >
+      <ECState Name="START" Comment="Initial State" x="555.55554" y="427.77777" >
+      </ECState>
+      <ECState Name="REQ" Comment="Normal execution" x="216.66666" y="755.55554" >
+        <ECAction Algorithm="REQ" Output="CNF" />
+      </ECState>
+      <ECTransition Source="START" Destination="REQ" Condition="REQ" x="555.55554" y="600.0" />
+      <ECTransition Source="REQ" Destination="START" Condition="1" x="216.66666" y="427.77777" />
+    </ECC>
+  <Algorithm Name="REQ" Comment="Normally executed algorithm" >
+    <ST Text="OUT:=IN1-IN2;&#10;" />
+  </Algorithm>
+  </BasicFB>
+</FBType>
diff --git a/Arrowhead/FBRT/math/N_TBL.fbt b/Arrowhead/FBRT/math/N_TBL.fbt
new file mode 100644
index 0000000..66e6e98
--- /dev/null
+++ b/Arrowhead/FBRT/math/N_TBL.fbt
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "../LibraryElement.dtd" >
+<FBType Name="N_TBL" Comment="Gets the Nth element from a list of strings" >
+  <Identification Standard="61499-1" Classification="Math" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-04-21" />
+  <CompilerInfo header="package fb.rt.math; " >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="REQ" Comment="Table Lookup" >
+        <With Var="N" />
+        <With Var="VALUES" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="CNF" Comment="Lookup Result" >
+        <With Var="VALUE" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="N" Type="UINT" Comment="Key for Lookup" />
+      <VarDeclaration Name="VALUES" Type="WSTRING" Comment="Comma-separated List of Values" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="VALUE" Type="WSTRING" Comment="Lookup Result,Empty if Lookup Failed" />
+    </OutputVars>
+  </InterfaceList>
+  <Service RightInterface="N_TBL" LeftInterface="APPLICATION" >
+    <ServiceSequence Name="normal_lookup" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="APPLICATION" Event="REQ" Parameters="KEY" />
+        <OutputPrimitive Interface="APPLICATION" Event="CNF" Parameters="VALUE" />
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="lookup_error" >
+      <ServiceTransaction >
+        <InputPrimitive Interface="APPLICATION" Event="REQ" Parameters="SD" />
+        <OutputPrimitive Interface="APPLICATION" Event="CNF" Parameters="&#34;&#34;" />
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/io/embrick/EBBusAdapter.adp b/Arrowhead/io/embrick/EBBusAdapter.adp
new file mode 100644
index 0000000..e5a017f
--- /dev/null
+++ b/Arrowhead/io/embrick/EBBusAdapter.adp
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE AdapterType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<AdapterType Name="EBBusAdapter">
+  <Identification Standard="61499-1"/>
+  <VersionInfo Author="GE" Date="2008-04-22" Organization="4DIAC-Consortium" Version="0.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Initialization Confirm" Name="INITO" Type="Event">
+        <With Var="QO"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Service Initialization" Name="INIT" Type="Event">
+        <With Var="Index"/>
+        <With Var="UpdateInterval"/>
+        <With Var="MasterId"/>
+        <With Var="QI"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QO" Type="BOOL"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QI" Type="BOOL"/>
+      <VarDeclaration Name="MasterId" Type="UINT"/>
+      <VarDeclaration Name="Index" Type="UINT"/>
+      <VarDeclaration Comment="Global update interval of slave modules in Hz" Name="UpdateInterval" Type="UINT"/>
+    </OutputVars>
+  </InterfaceList>
+  <Service LeftInterface="SOCKET" RightInterface="PLUG">
+    <ServiceSequence Name="request_confirm">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ" Interface="SOCKET" Parameters="REQD"/>
+        <OutputPrimitive Event="REQ" Interface="PLUG" Parameters="REQD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="CNF" Interface="PLUG" Parameters="CNFD"/>
+        <OutputPrimitive Event="CNF" Interface="SOCKET" Parameters="CNFD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="indication_response">
+      <ServiceTransaction>
+        <InputPrimitive Event="IND" Interface="PLUG" Parameters="INDD"/>
+        <OutputPrimitive Event="IND" Interface="SOCKET" Parameters="INDD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="RSP" Interface="SOCKET" Parameters="RSPD"/>
+        <OutputPrimitive Event="RSP" Interface="PLUG" Parameters="RSPD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</AdapterType>
diff --git a/Arrowhead/io/embrick/EBMaster.fbt b/Arrowhead/io/embrick/EBMaster.fbt
new file mode 100644
index 0000000..be67852
--- /dev/null
+++ b/Arrowhead/io/embrick/EBMaster.fbt
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Service Interface Function Block Type" Name="EBMaster">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2016-11-30" Organization="4DIAC-Consortium" Version="0.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Service Initialization" Name="INIT" Type="Event">
+        <With Var="QI"/>
+        <With Var="BusInitSpeed"/>
+        <With Var="SlaveUpdateInterval"/>
+        <With Var="BusLoopSpeed"/>
+        <With Var="BusInterface"/>
+        <With Var="BusSelectPin"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Initialization Confirm" Name="INITO" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+      </Event>
+      <Event Comment="Indication from Resource" Name="IND" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Event Input Qualifier" Name="QI" Type="BOOL"/>
+      <VarDeclaration Comment="ID of SPI interface" InitialValue="1" Name="BusInterface" Type="UINT"/>
+      <VarDeclaration Comment="SPI slave select pin" InitialValue="49" Name="BusSelectPin" Type="UINT"/>
+      <VarDeclaration Comment="SPI speed during initialization" InitialValue="300000" Name="BusInitSpeed" Type="UDINT"/>
+      <VarDeclaration Comment="SPI speed during runtime" InitialValue="700000" Name="BusLoopSpeed" Type="UDINT"/>
+      <VarDeclaration Comment="Global update interval of slave modules in Hz" InitialValue="25" Name="SlaveUpdateInterval" Type="UINT"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Event Output Qualifier" Name="QO" Type="BOOL"/>
+      <VarDeclaration Comment="Service Status" Name="STATUS" Type="WSTRING"/>
+    </OutputVars>
+    <Plugs>
+      <AdapterDeclaration Name="BusAdapterOut" Type="EBBusAdapter"/>
+    </Plugs>
+  </InterfaceList>
+  <Service Comment="Service Interface Function Block Type" LeftInterface="APPLICATION" RightInterface="RESOURCE">
+    <ServiceSequence Name="normal_establishment">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT+" Interface="APPLICATION" Parameters="PARAMS"/>
+        <OutputPrimitive Event="initialize" Interface="RESOURCE" Parameters="PARAMS"/>
+        <OutputPrimitive Event="INITO+" Interface="APPLICATION"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="unsuccessful_establishment">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT+" Interface="APPLICATION" Parameters="PARAMS"/>
+        <OutputPrimitive Event="initialize" Interface="RESOURCE" Parameters="PARAMS"/>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_confirm">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ+" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="request" Interface="RESOURCE" Parameters="SD"/>
+        <OutputPrimitive Event="CNF+" Interface="APPLICATION" Parameters="RD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_inhibited">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ-" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="CNF-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_error">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ+" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="request" Interface="RESOURCE" Parameters="SD"/>
+        <OutputPrimitive Event="CNF-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="indication_response">
+      <ServiceTransaction>
+        <InputPrimitive Event="indicate" Interface="RESOURCE" Parameters="RD"/>
+        <OutputPrimitive Event="IND+" Interface="APPLICATION" Parameters="RD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="RSP" Interface="APPLICATION" Parameters="QI,SD"/>
+        <OutputPrimitive Event="response" Interface="RESOURCE" Parameters="QI,SD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="indication_inhibited">
+      <ServiceTransaction>
+        <InputPrimitive Event="indicate" Interface="RESOURCE" Parameters="RD,QI=FALSE"/>
+        <OutputPrimitive Event="inhibited" Interface="RESOURCE"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="error_indication">
+      <ServiceTransaction>
+        <InputPrimitive Event="error" Interface="RESOURCE" Parameters="STATUS"/>
+        <OutputPrimitive Event="IND-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="application_initiated_termination">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT-" Interface="APPLICATION"/>
+        <OutputPrimitive Event="terminate" Interface="RESOURCE"/>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="resource_initiated_termination">
+      <ServiceTransaction>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/io/embrick/EBSlave2181.fbt b/Arrowhead/io/embrick/EBSlave2181.fbt
new file mode 100644
index 0000000..3d4bb7d
--- /dev/null
+++ b/Arrowhead/io/embrick/EBSlave2181.fbt
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Service Interface Function Block Type" Name="EBSlave2181">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2016-11-30" Organization="4DIAC-Consortium" Version="0.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Map Pins" Name="MAP" Type="Event">
+        <With Var="DigitalInput_1"/>
+        <With Var="DigitalInput_2"/>
+        <With Var="DigitalInput_5"/>
+        <With Var="DigitalInput_3"/>
+        <With Var="DigitalInput_4"/>
+        <With Var="DigitalInput_6"/>
+        <With Var="DigitalInput_7"/>
+        <With Var="DigitalInput_8"/>
+        <With Var="DigitalOutput_1"/>
+        <With Var="DigitalOutput_2"/>
+        <With Var="DigitalOutput_3"/>
+        <With Var="DigitalOutput_4"/>
+        <With Var="DigitalOutput_5"/>
+        <With Var="DigitalOutput_6"/>
+        <With Var="DigitalOutput_7"/>
+        <With Var="DigitalOutput_8"/>
+        <With Var="QI"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Confirm Pin Mapping" Name="MAPO" Type="Event">
+        <With Var="QO"/>
+      </Event>
+      <Event Comment="Indication from Resource" Name="IND" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Event Input Qualifier" Name="QI" Type="BOOL"/>
+      <VarDeclaration Name="DigitalInput_1" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalInput_2" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalInput_3" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalInput_4" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalInput_5" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalInput_6" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalInput_7" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalInput_8" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalOutput_1" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalOutput_2" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalOutput_3" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalOutput_4" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalOutput_5" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalOutput_6" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalOutput_7" Type="WSTRING"/>
+      <VarDeclaration Name="DigitalOutput_8" Type="WSTRING"/>
+      <VarDeclaration Comment="Update interval of slave module in Hz (inherited from Master)" Name="UpdateInterval" Type="UINT"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Event Output Qualifier" Name="QO" Type="BOOL"/>
+      <VarDeclaration Comment="Service Status" Name="STATUS" Type="WSTRING"/>
+    </OutputVars>
+    <Sockets>
+      <AdapterDeclaration Name="BusAdapterIn" Type="EBBusAdapter"/>
+    </Sockets>
+    <Plugs>
+      <AdapterDeclaration Name="BusAdapterOut" Type="EBBusAdapter"/>
+    </Plugs>
+  </InterfaceList>
+  <Service Comment="Service Interface Function Block Type" LeftInterface="APPLICATION" RightInterface="RESOURCE">
+    <ServiceSequence Name="normal_establishment">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT+" Interface="APPLICATION" Parameters="PARAMS"/>
+        <OutputPrimitive Event="initialize" Interface="RESOURCE" Parameters="PARAMS"/>
+        <OutputPrimitive Event="INITO+" Interface="APPLICATION"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="unsuccessful_establishment">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT+" Interface="APPLICATION" Parameters="PARAMS"/>
+        <OutputPrimitive Event="initialize" Interface="RESOURCE" Parameters="PARAMS"/>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_confirm">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ+" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="request" Interface="RESOURCE" Parameters="SD"/>
+        <OutputPrimitive Event="CNF+" Interface="APPLICATION" Parameters="RD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_inhibited">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ-" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="CNF-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_error">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ+" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="request" Interface="RESOURCE" Parameters="SD"/>
+        <OutputPrimitive Event="CNF-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="indication_response">
+      <ServiceTransaction>
+        <InputPrimitive Event="indicate" Interface="RESOURCE" Parameters="RD"/>
+        <OutputPrimitive Event="IND+" Interface="APPLICATION" Parameters="RD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="RSP" Interface="APPLICATION" Parameters="QI,SD"/>
+        <OutputPrimitive Event="response" Interface="RESOURCE" Parameters="QI,SD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="indication_inhibited">
+      <ServiceTransaction>
+        <InputPrimitive Event="indicate" Interface="RESOURCE" Parameters="RD,QI=FALSE"/>
+        <OutputPrimitive Event="inhibited" Interface="RESOURCE"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="error_indication">
+      <ServiceTransaction>
+        <InputPrimitive Event="error" Interface="RESOURCE" Parameters="STATUS"/>
+        <OutputPrimitive Event="IND-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="application_initiated_termination">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT-" Interface="APPLICATION"/>
+        <OutputPrimitive Event="terminate" Interface="RESOURCE"/>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="resource_initiated_termination">
+      <ServiceTransaction>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/io/embrick/EBSlave2301.fbt b/Arrowhead/io/embrick/EBSlave2301.fbt
new file mode 100644
index 0000000..d762613
--- /dev/null
+++ b/Arrowhead/io/embrick/EBSlave2301.fbt
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Service Interface Function Block Type" Name="EBSlave2301">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="4DIAC-IDE" Date="2016-11-30" Organization="4DIAC-Consortium" Version="0.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Map Pins" Name="MAP" Type="Event">
+        <With Var="Relay_1"/>
+        <With Var="Relay_2"/>
+        <With Var="Relay_3"/>
+        <With Var="Relay_4"/>
+        <With Var="Relay_5"/>
+        <With Var="Relay_6"/>
+        <With Var="QI"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Confirm Pin Mapping" Name="MAPO" Type="Event">
+        <With Var="QO"/>
+      </Event>
+      <Event Comment="Indication from Resource" Name="IND" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Event Input Qualifier" Name="QI" Type="BOOL"/>
+      <VarDeclaration Name="Relay_1" Type="WSTRING"/>
+      <VarDeclaration Name="Relay_2" Type="WSTRING"/>
+      <VarDeclaration Name="Relay_3" Type="WSTRING"/>
+      <VarDeclaration Name="Relay_4" Type="WSTRING"/>
+      <VarDeclaration Name="Relay_5" Type="WSTRING"/>
+      <VarDeclaration Name="Relay_6" Type="WSTRING"/>
+      <VarDeclaration Comment="Update interval of slave module in Hz (inherited from Master)" Name="UpdateInterval" Type="UINT"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Event Output Qualifier" Name="QO" Type="BOOL"/>
+      <VarDeclaration Comment="Service Status" Name="STATUS" Type="WSTRING"/>
+    </OutputVars>
+    <Sockets>
+      <AdapterDeclaration Name="BusAdapterIn" Type="EBBusAdapter"/>
+    </Sockets>
+    <Plugs>
+      <AdapterDeclaration Name="BusAdapterOut" Type="EBBusAdapter"/>
+    </Plugs>
+  </InterfaceList>
+  <Service Comment="Service Interface Function Block Type" LeftInterface="APPLICATION" RightInterface="RESOURCE">
+    <ServiceSequence Name="normal_establishment">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT+" Interface="APPLICATION" Parameters="PARAMS"/>
+        <OutputPrimitive Event="initialize" Interface="RESOURCE" Parameters="PARAMS"/>
+        <OutputPrimitive Event="INITO+" Interface="APPLICATION"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="unsuccessful_establishment">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT+" Interface="APPLICATION" Parameters="PARAMS"/>
+        <OutputPrimitive Event="initialize" Interface="RESOURCE" Parameters="PARAMS"/>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_confirm">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ+" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="request" Interface="RESOURCE" Parameters="SD"/>
+        <OutputPrimitive Event="CNF+" Interface="APPLICATION" Parameters="RD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_inhibited">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ-" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="CNF-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="request_error">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ+" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="request" Interface="RESOURCE" Parameters="SD"/>
+        <OutputPrimitive Event="CNF-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="indication_response">
+      <ServiceTransaction>
+        <InputPrimitive Event="indicate" Interface="RESOURCE" Parameters="RD"/>
+        <OutputPrimitive Event="IND+" Interface="APPLICATION" Parameters="RD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="RSP" Interface="APPLICATION" Parameters="QI,SD"/>
+        <OutputPrimitive Event="response" Interface="RESOURCE" Parameters="QI,SD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="indication_inhibited">
+      <ServiceTransaction>
+        <InputPrimitive Event="indicate" Interface="RESOURCE" Parameters="RD,QI=FALSE"/>
+        <OutputPrimitive Event="inhibited" Interface="RESOURCE"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="error_indication">
+      <ServiceTransaction>
+        <InputPrimitive Event="error" Interface="RESOURCE" Parameters="STATUS"/>
+        <OutputPrimitive Event="IND-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="application_initiated_termination">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT-" Interface="APPLICATION"/>
+        <OutputPrimitive Event="terminate" Interface="RESOURCE"/>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Name="resource_initiated_termination">
+      <ServiceTransaction>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/net/CLIENT_0_1.fbt b/Arrowhead/net/CLIENT_0_1.fbt
new file mode 100644
index 0000000..71e90b2
--- /dev/null
+++ b/Arrowhead/net/CLIENT_0_1.fbt
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="CLIENT_0_1" Comment="Single-RD Client Interface" >
+  <Identification Standard="61499-1" Function="Communication" Description="0SD/1RD Client" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2001-09-18" />
+  <CompilerInfo header="package fb.rt.net;" >
+    <Compiler Language="Java" Vendor="IBM" Product="VisualAge" Version="3.0" />
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Service Initialization" >
+        <With Var="QI" />
+        <With Var="ID" />
+      </Event>
+      <Event Name="REQ" Comment="Service Request" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+      </Event>
+      <Event Name="CNF" Comment="Service Confirmation" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+        <With Var="RD_1" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" Comment="Event Input Qualifier" />
+      <VarDeclaration Name="ID" Type="WSTRING" Comment="Connection Identifier" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Event Output Qualifier" />
+      <VarDeclaration Name="STATUS" Type="WSTRING" Comment="Service Status" />
+      <VarDeclaration Name="RD_1" Type="ANY" Comment="Received Data" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/net/CLIENT_0_2.fbt b/Arrowhead/net/CLIENT_0_2.fbt
new file mode 100644
index 0000000..3208ba3
--- /dev/null
+++ b/Arrowhead/net/CLIENT_0_2.fbt
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Two-Item Client Interface" Name="CLIENT_0_2">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="JHC" Date="2004-10-21" Organization="Rockwell Automation" Remarks="Converted from SRC version." Version="0.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Service Initialization" Name="INIT" Type="Event">
+        <With Var="QI"/>
+        <With Var="ID"/>
+      </Event>
+      <Event Comment="Service Request" Name="REQ" Type="Event">
+        <With Var="QI"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Initialization Confirm" Name="INITO" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+      </Event>
+      <Event Comment="Service Confirmation" Name="CNF" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+        <With Var="RD_1"/>
+        <With Var="RD_2"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Event Input Qualifier" Name="QI" Type="BOOL"/>
+      <VarDeclaration Comment="Connection Identifier" Name="ID" Type="WSTRING"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Event Output Qualifier" Name="QO" Type="BOOL"/>
+      <VarDeclaration Comment="Service Status" Name="STATUS" Type="WSTRING"/>
+      <VarDeclaration Comment="Received Data" Name="RD_1" Type="ANY"/>
+      <VarDeclaration Comment="Received Data" Name="RD_2" Type="ANY"/>
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/net/CLIENT_1_0.fbt b/Arrowhead/net/CLIENT_1_0.fbt
new file mode 100644
index 0000000..8627706
--- /dev/null
+++ b/Arrowhead/net/CLIENT_1_0.fbt
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="" Name="CLIENT_1_0">
+  <Identification Description="Copyright (c) 2017 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Alois Zoitl" Date="2017-10-25" Organization="fortiss GmbH" Remarks="initial API and implementation and/or initial documentation" Version="1.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="" Name="INIT" Type="Event">
+        <With Var="QI"/>
+        <With Var="ID"/>
+      </Event>
+      <Event Comment="" Name="REQ" Type="Event">
+        <With Var="QI"/>
+        <With Var="SD_1"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="" Name="INITO" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+      </Event>
+      <Event Comment="" Name="CNF" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="" Name="QI" Type="BOOL"/>
+      <VarDeclaration Comment="" Name="ID" Type="WSTRING"/>
+      <VarDeclaration Comment="" Name="SD_1" Type="ANY"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="" Name="QO" Type="BOOL"/>
+      <VarDeclaration Comment="" Name="STATUS" Type="WSTRING"/>
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/net/SERVER_0.fbt b/Arrowhead/net/SERVER_0.fbt
new file mode 100644
index 0000000..28ac095
--- /dev/null
+++ b/Arrowhead/net/SERVER_0.fbt
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<FBType Name="SERVER_0" Comment="Event Interlock Server Interface" >
+  <Identification Standard="61499-2" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-03-23" Remarks="Fixed NULL encoding." />
+  <CompilerInfo header="package fb.rt.net;" >
+  </CompilerInfo>
+  <InterfaceList>
+    <EventInputs>
+      <Event Name="INIT" Comment="Service Initialization" >
+        <With Var="QI" />
+        <With Var="ID" />
+      </Event>
+      <Event Name="RSP" Comment="Service Response" >
+        <With Var="QI" />
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Name="INITO" Comment="Initialization Confirm" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+      </Event>
+      <Event Name="IND" Comment="Service Indication" >
+        <With Var="QO" />
+        <With Var="STATUS" />
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Name="QI" Type="BOOL" Comment="Event Input Qualifier" />
+      <VarDeclaration Name="ID" Type="WSTRING" Comment="Connection Identifier" />
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Name="QO" Type="BOOL" Comment="Event Output Qualifier" />
+      <VarDeclaration Name="STATUS" Type="WSTRING" Comment="Service Status" />
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/net/SERVER_0_2.fbt b/Arrowhead/net/SERVER_0_2.fbt
new file mode 100644
index 0000000..002c708
--- /dev/null
+++ b/Arrowhead/net/SERVER_0_2.fbt
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="" Name="SERVER_0_2">
+  <Identification Description="Copyright (c) 2017 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
+  <VersionInfo Author="Alois Zoitl" Date="2017-10-25" Organization="fortiss GmbH" Remarks="initial API and implementation and/or initial documentation" Version="1.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="" Name="INIT" Type="Event">
+        <With Var="QI"/>
+        <With Var="ID"/>
+      </Event>
+      <Event Comment="" Name="RSP" Type="Event">
+        <With Var="QI"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="" Name="INITO" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+      </Event>
+      <Event Comment="" Name="IND" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+        <With Var="RD_1"/>
+        <With Var="RD_2"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="" Name="QI" Type="BOOL"/>
+      <VarDeclaration Comment="" Name="ID" Type="WSTRING"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="" Name="QO" Type="BOOL"/>
+      <VarDeclaration Comment="" Name="STATUS" Type="WSTRING"/>
+      <VarDeclaration Comment="" Name="RD_1" Type="ANY"/>
+      <VarDeclaration Comment="" Name="RD_2" Type="ANY"/>
+    </OutputVars>
+  </InterfaceList>
+</FBType>
diff --git a/Arrowhead/net/SERVER_1_0.fbt b/Arrowhead/net/SERVER_1_0.fbt
new file mode 100644
index 0000000..cb567f7
--- /dev/null
+++ b/Arrowhead/net/SERVER_1_0.fbt
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Service Interface Function Block Type" Name="SERVER_1_0">
+  <Identification Standard="61499-2"/>
+  <VersionInfo Author="cabral" Date="2018-08-21" Version="1.0"/>
+  <InterfaceList>
+    <EventInputs>
+      <Event Comment="Service Initialization" Name="INIT" Type="Event">
+        <With Var="QI"/>
+        <With Var="ID"/>
+      </Event>
+      <Event Comment="Application Response to IND" Name="RSP" Type="Event">
+        <With Var="QI"/>
+        <With Var="SD_1"/>
+      </Event>
+    </EventInputs>
+    <EventOutputs>
+      <Event Comment="Initialization Confirm" Name="INITO" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+      </Event>
+      <Event Comment="Indication from Resource" Name="IND" Type="Event">
+        <With Var="QO"/>
+        <With Var="STATUS"/>
+      </Event>
+    </EventOutputs>
+    <InputVars>
+      <VarDeclaration Comment="Event Input Qualifier" Name="QI" Type="BOOL"/>
+      <VarDeclaration Comment="Service Parameters" Name="ID" Type="WSTRING"/>
+      <VarDeclaration Comment="Output data to resource" Name="SD_1" Type="ANY"/>
+    </InputVars>
+    <OutputVars>
+      <VarDeclaration Comment="Event Output Qualifier" Name="QO" Type="BOOL"/>
+      <VarDeclaration Comment="Service Status" Name="STATUS" Type="WSTRING"/>
+    </OutputVars>
+  </InterfaceList>
+  <Service Comment="Service Interface Function Block Type" LeftInterface="APPLICATION" RightInterface="RESOURCE">
+    <ServiceSequence Comment="" Name="normal_establishment">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT+" Interface="APPLICATION" Parameters="PARAMS"/>
+        <OutputPrimitive Event="initialize" Interface="RESOURCE" Parameters="PARAMS"/>
+        <OutputPrimitive Event="INITO+" Interface="APPLICATION"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="unsuccessful_establishment">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT+" Interface="APPLICATION" Parameters="PARAMS"/>
+        <OutputPrimitive Event="initialize" Interface="RESOURCE" Parameters="PARAMS"/>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="request_confirm">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ+" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="request" Interface="RESOURCE" Parameters="SD"/>
+        <OutputPrimitive Event="CNF+" Interface="APPLICATION" Parameters="RD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="request_inhibited">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ-" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="CNF-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="request_error">
+      <ServiceTransaction>
+        <InputPrimitive Event="REQ+" Interface="APPLICATION" Parameters="SD"/>
+        <OutputPrimitive Event="request" Interface="RESOURCE" Parameters="SD"/>
+        <OutputPrimitive Event="CNF-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="indication_response">
+      <ServiceTransaction>
+        <InputPrimitive Event="indicate" Interface="RESOURCE" Parameters="RD"/>
+        <OutputPrimitive Event="IND+" Interface="APPLICATION" Parameters="RD"/>
+      </ServiceTransaction>
+      <ServiceTransaction>
+        <InputPrimitive Event="RSP" Interface="APPLICATION" Parameters="QI,SD"/>
+        <OutputPrimitive Event="response" Interface="RESOURCE" Parameters="QI,SD"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="indication_inhibited">
+      <ServiceTransaction>
+        <InputPrimitive Event="indicate" Interface="RESOURCE" Parameters="RD,QI=FALSE"/>
+        <OutputPrimitive Event="inhibited" Interface="RESOURCE"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="error_indication">
+      <ServiceTransaction>
+        <InputPrimitive Event="error" Interface="RESOURCE" Parameters="STATUS"/>
+        <OutputPrimitive Event="IND-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="application_initiated_termination">
+      <ServiceTransaction>
+        <InputPrimitive Event="INIT-" Interface="APPLICATION"/>
+        <OutputPrimitive Event="terminate" Interface="RESOURCE"/>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+    <ServiceSequence Comment="" Name="resource_initiated_termination">
+      <ServiceTransaction>
+        <OutputPrimitive Event="INITO-" Interface="APPLICATION" Parameters="STATUS"/>
+      </ServiceTransaction>
+    </ServiceSequence>
+  </Service>
+</FBType>
diff --git a/Arrowhead/resources/PANEL_RESOURCE.res b/Arrowhead/resources/PANEL_RESOURCE.res
new file mode 100644
index 0000000..f494c17
--- /dev/null
+++ b/Arrowhead/resources/PANEL_RESOURCE.res
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ResourceType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
+<ResourceType Name="PANEL_RESOURCE" Comment="Resource for graphic Panel" >
+  <Identification Standard="61499-2" />
+  <VersionInfo Organization="Holobloc Inc" Version="0.3" Author="JHC" Date="2006-02-28" Remarks="Removed TRACE, set pkg to fb.rt.hmi." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.2" Author="JHC" Date="2000-05-28" Remarks="Set E_RESTART position." />
+  <VersionInfo Organization="Rockwell Automation" Version="0.1" Author="JHC" Date="2000-05-10" Remarks="Removed &#34;Speed&#34; Attribute" />
+  <VersionInfo Organization="Rockwell Automation" Version="0.0" Author="JHC" Date="2000-01-25" Remarks="Testing &#34;Speed&#34; Attribute" />
+  <CompilerInfo header="package fb.rt.hmi; import java.awt.*;" >
+    <Compiler Language="Java" Vendor="Sun" Product="JDK" Version="1.5.0" />
+  </CompilerInfo>
+  <VarDeclaration Name="ROWS" Type="DINT" Comment="Rows(if any)in grid layout" />
+  <VarDeclaration Name="COLS" Type="DINT" Comment="Columns(if any)in grid layout" />
+  <FBNetwork >
+    <FB Name="START" Type="E_RESTART" x="11.7647" y="11.7647" />
+  </FBNetwork>
+</ResourceType>
diff --git a/Arrowhead/virtualDNS.dns b/Arrowhead/virtualDNS.dns
index fa3de3e..1aa306e 100644
--- a/Arrowhead/virtualDNS.dns
+++ b/Arrowhead/virtualDNS.dns
@@ -1,18 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<virtualDNS:VirtualDNSManagement xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:virtualDNS="org.eclipse.fordiac.ide.virtualDNS" activeVirtualDNS="//@availableDNSCollections.0">
+<virtualDNS:VirtualDNSManagement xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:virtualDNS="org.eclipse.fordiac.ide.virtualDNS">
   <availableDNSCollections name="arrowheadTests">
-    <virtualDNSEntries name="wagoIp" value=""/>
-    <virtualDNSEntries name="revpiIp" value=""/>
-    <virtualDNSEntries name="embrickIp" value=""/>
     <virtualDNSEntries name="serviceRegistryAddress" value="WSTRING#127.0.0.1:8442/serviceregistry"/>
-    <virtualDNSEntries name="wagoPort" value=""/>
-    <virtualDNSEntries name="rpiIP" value=""/>
-    <virtualDNSEntries name="localIP" value=""/>
-    <virtualDNSEntries name="serviceName" value=""/>
-    <virtualDNSEntries name="humidityDevice" value=""/>
     <virtualDNSEntries name="testAddress" value="localhost"/>
     <virtualDNSEntries name="emptyEndpoint" value="WSTRING#:0"/>
-    <virtualDNSEntries name="windowIP" value=""/>
     <virtualDNSEntries name="serviceDefinition" value="WSTRING#serviceTest"/>
     <virtualDNSEntries name="systemName" value="WSTRING#systemTestName"/>
     <virtualDNSEntries name="addressSeparator" value=":"/>
@@ -44,5 +35,48 @@
     <virtualDNSEntries name="test8Ended" value="test8Ended"/>
     <virtualDNSEntries name="serviceRegistryOpcUaAddress" value="opc.tcp://127.0.0.1:12686/arrowhead"/>
     <virtualDNSEntries name="allLoaded" value="WSTRING#allLoaded"/>
+    <virtualDNSEntries name="eventHandlerAddress" value="WSTRING#127.0.0.1:8454/eventhandler"/>
+    <virtualDNSEntries name="eventType" value="WSTRING#eventType4diac"/>
+    <virtualDNSEntries name="eventPayload" value="WSTRING#This is the payload of the event"/>
+    <virtualDNSEntries name="httpTestAddress" value="localhost:61499"/>
+  </availableDNSCollections>
+  <availableDNSCollections name="arrowheadTestsOpcUa">
+    <virtualDNSEntries name="serviceRegistryAddress" value="WSTRING#opc.tcp://127.0.0.1:62551/serviceregistry"/>
+    <virtualDNSEntries name="testAddress" value="localhost"/>
+    <virtualDNSEntries name="emptyEndpoint" value="WSTRING#:0"/>
+    <virtualDNSEntries name="serviceDefinition" value="WSTRING#serviceTest"/>
+    <virtualDNSEntries name="systemName" value="WSTRING#systemTestName"/>
+    <virtualDNSEntries name="addressSeparator" value=":"/>
+    <virtualDNSEntries name="testPort" value="61499"/>
+    <virtualDNSEntries name="systemPort" value="4840"/>
+    <virtualDNSEntries name="serviceURI" value="/serviceTest/start"/>
+    <virtualDNSEntries name="serviceVersion" value="1"/>
+    <virtualDNSEntries name="serviceMetadata" value="[&quot;key1=value1&quot;, &quot;key2=value2&quot;]"/>
+    <virtualDNSEntries name="validEndpoint" value="WSTRING#localhost:4840/serviceTest/start"/>
+    <virtualDNSEntries name="metadata" value="&quot;key=value1, key2=value2&quot;"/>
+    <virtualDNSEntries name="firstResourceReady" value="WSTRIGN#RegisterUnregisterTestReady"/>
+    <virtualDNSEntries name="serviceDefinition2" value="WSTRING#serviceTest2"/>
+    <virtualDNSEntries name="serviceURI2" value="/serviceTest/start2"/>
+    <virtualDNSEntries name="validEndpoint2" value="WSTRING#localhost:4840/serviceTest/start2"/>
+    <virtualDNSEntries name="secondResourceReady" value="WSTRIGN#DoubleRegisterReady"/>
+    <virtualDNSEntries name="cleanFinished" value="WSTRIGN#allCleaned"/>
+    <virtualDNSEntries name="testMoreServicesReady" value="WSTRIGN#testMoreServicesReady"/>
+    <virtualDNSEntries name="systemName2" value="WSTRING#systemTestName2"/>
+    <virtualDNSEntries name="sameServiceTwiceReady" value="WSTRIGN#sameServiceTwiceReady"/>
+    <virtualDNSEntries name="allEnded" value="WSTRIGN#allEnded"/>
+    <virtualDNSEntries name="versionEnded" value="WSTRIGN#versionEnded"/>
+    <virtualDNSEntries name="orchestratorAddress" value="WSTRING#opc.tcp://127.0.0.1:62548/orchestrator"/>
+    <virtualDNSEntries name="test6Ended" value="test6Ended"/>
+    <virtualDNSEntries name="test7Ended" value="WSTRING#test7Ended"/>
+    <virtualDNSEntries name="authRuleEndpoint" value="opc.tcp://127.0.0.1:62541/authorization/"/>
+    <virtualDNSEntries name="authRuleData" value="{&quot;consumer&quot;: {&quot;systemName&quot; : &quot;systemTestName&quot;,&quot;address&quot; : &quot;localhost&quot;,&quot;port&quot; : 4840},&quot;providerList&quot;: [{&quot;systemName&quot; : &quot;systemTestName&quot;,&quot;address&quot; : &quot;localhost&quot;,&quot;port&quot; : 4840}],&quot;serviceList&quot;: [{&quot;serviceDefinition&quot; : &quot;serviceTest&quot;}]}"/>
+    <virtualDNSEntries name="orchRuleData" value="[{&quot;service&quot; : {&quot;serviceDefinition&quot; : &quot;serviceTest&quot;,&quot;interfaces&quot; : [ &quot;XML&quot;, &quot;JSON&quot;],&quot;serviceMetadata&quot; : { &quot;key1&quot; : &quot;value1&quot;, &quot;key2&quot; : &quot;value2&quot;}},&quot;consumer&quot; : {&quot;systemName&quot; : &quot;systemTestName&quot;,&quot;address&quot; :&quot;localhost&quot;,&quot;port&quot; : 4840, &quot;authenticationInfo&quot; : &quot;&quot;},&quot;providerSystem&quot; : {&quot;systemName&quot; : &quot;systemTestName&quot;,&quot;address&quot; : &quot;localhost&quot;,&quot;port&quot; : 4840,&quot;authenticationInfo&quot; : &quot;&quot;},&quot;priority&quot; : 1,&quot;defaultEntry&quot; : true,&quot;name&quot; : &quot;&quot;,&quot;lastUpdated&quot; : &quot;&quot;,&quot;instruction&quot; : &quot;&quot;,&quot;attributes&quot; : { },&quot;serviceURI&quot; : &quot;serviceTest/start&quot;} ]"/>
+    <virtualDNSEntries name="test8Ended" value="test8Ended"/>
+    <virtualDNSEntries name="allLoaded" value="WSTRING#allLoaded"/>
+    <virtualDNSEntries name="eventHandlerAddress" value="WSTRING#opc.tcp://127.0.0.1:62544/eventhandler"/>
+    <virtualDNSEntries name="eventType" value="WSTRING#eventType4diac"/>
+    <virtualDNSEntries name="eventPayload" value="WSTRING#This is the payload of the event"/>
+    <virtualDNSEntries name="opcuaTestAddress" value="localhost:61499"/>
+    <virtualDNSEntries name="orchestratorEndpoint" value="opc.tcp://127.0.0.1:62548/orchestrator"/>
   </availableDNSCollections>
 </virtualDNS:VirtualDNSManagement>