diff --git a/tt3plugins/EtsiCommon/TT3plugin.xml b/tt3plugins/EtsiCommon/TT3plugin.xml
index 467c8443e3c421c87c2ea1ee040b0ac7c9313116..8b8acde59e6e7642abb080b3e7e10d3344be5b52 100644
--- a/tt3plugins/EtsiCommon/TT3plugin.xml
+++ b/tt3plugins/EtsiCommon/TT3plugin.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
 <plugin id="org.etsi.common" name="ETSI Common" provider-name="ETSI" version="1.0.0.0">
   <runtime>
     <library name="EtsiCommon.jar"/>
     <library name="../../build"/>
   </runtime>
-  <dependency/>
+  <dependency>
+    <reference id="com.testingtech.ttworkbench.sa"/>
+  </dependency>
 </plugin>
diff --git a/tt3plugins/EtsiCommonAdapter/TT3plugin.xml b/tt3plugins/EtsiCommonAdapter/TT3plugin.xml
index 4846775c3aa6264f8fb78434bb58e5023ad82ded..c1f0a5b641aca60eaa825f16fa4f9047f8ed3ded 100644
--- a/tt3plugins/EtsiCommonAdapter/TT3plugin.xml
+++ b/tt3plugins/EtsiCommonAdapter/TT3plugin.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
 <plugin id="org.etsi.adapter" name="ETSI Common Adapter" provider-name="ETSI" version="1.0.0.0">
   <runtime>
     <library name="EtsiCommonAdapter.jar"/>
     <library name="../../build"/>
   </runtime>
   <dependency>
+    <reference id="com.testingtech.ttworkbench.sa"/>
     <reference id="org.etsi.its.uppertester"/>
   </dependency>
 </plugin>
diff --git a/tt3plugins/EtsiCommonCodec/TT3plugin.xml b/tt3plugins/EtsiCommonCodec/TT3plugin.xml
index 0b8eb414bd55c433e51471c043fd70c596199a6f..4e6e238c5bfce70c2d4554bab155dd60e50a1e08 100644
--- a/tt3plugins/EtsiCommonCodec/TT3plugin.xml
+++ b/tt3plugins/EtsiCommonCodec/TT3plugin.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
 <plugin id="org.etsi.codec" name="ETSI Common Codec" provider-name="ETSI" version="1.0.0.0">
   <runtime>
     <library name="EtsiCommonCodec.jar"/>
     <library name="../../build"/>
   </runtime>
   <dependency>
+    <reference id="com.testingtech.ttworkbench.sa"/>
     <reference id="org.etsi.common"/>
   </dependency>
 </plugin>
diff --git a/tt3plugins/EtsiItsAdapter/Commsignia/rxjava-1.0.8.jar b/tt3plugins/EtsiItsAdapter/Commsignia/rxjava-1.0.8.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f60ebe1261612315d71f8f192333bb1a919ca806
Binary files /dev/null and b/tt3plugins/EtsiItsAdapter/Commsignia/rxjava-1.0.8.jar differ
diff --git a/tt3plugins/EtsiItsAdapter/Commsignia/v2x-client-1.12.0-b185-javadoc.jar b/tt3plugins/EtsiItsAdapter/Commsignia/v2x-client-1.12.0-b185-javadoc.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f0987a2fa2de81325bfba5b25d3d23140cab0952
Binary files /dev/null and b/tt3plugins/EtsiItsAdapter/Commsignia/v2x-client-1.12.0-b185-javadoc.jar differ
diff --git a/tt3plugins/EtsiItsAdapter/Commsignia/v2x-client-1.12.0-b185.jar b/tt3plugins/EtsiItsAdapter/Commsignia/v2x-client-1.12.0-b185.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b3f5f136804e572363a8a7c501c9405ca2da33ad
Binary files /dev/null and b/tt3plugins/EtsiItsAdapter/Commsignia/v2x-client-1.12.0-b185.jar differ
diff --git a/tt3plugins/EtsiItsAdapter/TT3plugin.xml b/tt3plugins/EtsiItsAdapter/TT3plugin.xml
index 71f44464603432f4fb926227d242118e22459a1d..2434df848c56c9feabdeeb771abc697d595f21e9 100644
--- a/tt3plugins/EtsiItsAdapter/TT3plugin.xml
+++ b/tt3plugins/EtsiItsAdapter/TT3plugin.xml
@@ -10,12 +10,16 @@
     <library name="Preserve/de.fraunhofer.sit.c2x.pki.ca.jar"/>
     <library name="Preserve/de.fraunhofer.sit.c2x.pki.etsi_ts103097v1114.jar"/>
     <library name="Preserve/commons-codec-1.4.jar"/>
+    <library name="Commsignia/rxjava-1.0.8.jar"/>
+    <library name="Commsignia/v2x-client-1.12.0-b185.jar"/>
     <library name="../../build"/>
     <native path="JSon"/>
     <native path="jnetpcap-1.4.r1425"/>
     <native path="Preserve"/>
+    <native path="Commsignia"/>
   </runtime>
   <dependency>
+    <reference id="com.testingtech.ttworkbench.sa"/>
     <reference id="org.etsi.adapter"/>
   </dependency>
 </plugin>
diff --git a/tt3plugins/EtsiItsCommonCodec/TT3plugin.xml b/tt3plugins/EtsiItsCommonCodec/TT3plugin.xml
index f2dd5ce9152f6a80d395a0ed5f4cb88632cbcdf8..13eea0e2f3c92906b736c42ff93c4e8285b4957b 100644
--- a/tt3plugins/EtsiItsCommonCodec/TT3plugin.xml
+++ b/tt3plugins/EtsiItsCommonCodec/TT3plugin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
 <plugin id="org.etsi.its.codec" name="ETSI Its Common Codec" provider-name="ETSI" version="1.0.0.0">
   <runtime>
     <library name="EtsiItsCommonCodec.jar"/>
     <library name="../../build"/>
   </runtime>
   <dependency>
-    <reference id="org.etsi.codec"/>
+    <reference id="com.testingtech.ttworkbench.sa"/>
   </dependency>
 </plugin>
diff --git a/tt3plugins/EtsiItsExternalFunctions/TT3plugin.xml b/tt3plugins/EtsiItsExternalFunctions/TT3plugin.xml
index 86f7b28d83abe89159fd7c15767b82ec58aa3423..78ec01e740be2e2a366a7fc0cc2a806470a5ee31 100644
--- a/tt3plugins/EtsiItsExternalFunctions/TT3plugin.xml
+++ b/tt3plugins/EtsiItsExternalFunctions/TT3plugin.xml
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
 <plugin id="org.etsi.its.ttcn.ItsExternalFunctionsProvider" name="ETSI Its External functions" provider-name="ETSI" version="1.0.0.0">
   <runtime>
-    <library name="EtsiItsExternalFunctions.jar"/>
-    <library name="../../build"/>
   </runtime>
   <dependency>
-    <reference id="org.etsi.codec"/>
+    <reference id="com.testingtech.ttworkbench.sa"/>
   </dependency>
 </plugin>
diff --git a/tt3plugins/EtsiItsUpperTester/TT3plugin.xml b/tt3plugins/EtsiItsUpperTester/TT3plugin.xml
index 8758ea47b5e81c547323c2c98c3b1087b18a8053..d089b6ac05b9d509b203b3b7017bc1fe79e92c85 100644
--- a/tt3plugins/EtsiItsUpperTester/TT3plugin.xml
+++ b/tt3plugins/EtsiItsUpperTester/TT3plugin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
 <plugin id="org.etsi.its.uppertester" name="ETSI Its Upper Tester" provider-name="ETSI" version="1.0.0.0">
   <runtime>
     <library name="EtsiItsUpperTester.jar"/>
     <library name="../../build"/>
   </runtime>
   <dependency>
-    <reference id="org.etsi.codec"/>
+    <reference id="com.testingtech.ttworkbench.sa"/>
   </dependency>
 </plugin>
diff --git a/tt3plugins/MainCodec/TT3plugin.xml b/tt3plugins/MainCodec/TT3plugin.xml
index 095d41397a6f5fa1d2f3805aa42b57b642df1e56..1175191c940e7743c904d2fd93ca697ae66793fe 100644
--- a/tt3plugins/MainCodec/TT3plugin.xml
+++ b/tt3plugins/MainCodec/TT3plugin.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
 <plugin id="org.etsi.ttcn.codec.MainCodec" name="Main Codec" provider-name="STF462" version="1.0.0.0">
   <runtime>
     <library name="MainCodec.jar"/>
     <library name="../build"/>
   </runtime>
   <dependency>
-    <reference id="org.etsi.ttcn.codec"/>
-    <reference id="org.etsi.its.tool"/>
+    <reference id="com.testingtech.ttworkbench.sa"/>
   </dependency>
 </plugin>
diff --git a/tt3plugins/TT_TestSystem/TT3plugin.xml b/tt3plugins/TT_TestSystem/TT3plugin.xml
index 5a203ea8301bdf815492e78e7d8730b9da71fcf9..292f6593081aca3789bf51f0d1a54d3180d8a2c8 100644
--- a/tt3plugins/TT_TestSystem/TT3plugin.xml
+++ b/tt3plugins/TT_TestSystem/TT3plugin.xml
@@ -2,8 +2,6 @@
 <!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
 <plugin id="com.testingtech.ttworkbench" name="Testing Technologies TTworkbench Integration" provider-name="Testing Technologies IST GmbH" version="1.0.0.0">
   <runtime>
-    <library name="TT_TestSystem.jar"/>
-    <library name="../../build"/>
   </runtime>
   <dependency>
     <reference id="org.etsi.its.codec.tool.testingtech.LibItsCam_asn1"/>
@@ -17,6 +15,8 @@
     <reference id="org.etsi.its.ttcn.ItsExternalFunctionsProvider"/>
     <reference id="org.etsi.its.adapter"/>
     <reference id="org.etsi.ttcn.codec"/>
+    <reference id="org.etsi.codec"/>
+    <reference id="com.testingtech.ttworkbench.sa"/>
   </dependency>
   <extension point="com.testingtech.ttcn.extension.CodecProvider">
     <parameter id="class" value="org.etsi.its.tool.testingtech.Its_CodecProvider"/>
@@ -64,239 +64,4 @@
     <parameter id="name" value="Its External Function"/>
     <parameter id="description" value="The implementation of the external functions defined in the ITS project."/>
   </extension>
-  <extension point="com.testingtech.ttcn.tri.extension.PortPluginProvider">
-    <parameter id="class" value="org.etsi.its.tool.testingtech.PluginAdapter"/>
-    <parameter id="taParams">
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="DEBUG_ENABLED"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="ALL"/>
-        <parameter id="description" value="Set to ALL/INFO/OFF to activate full/medium/no traces"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="camPort"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="CamSource"/>
-        <parameter id="description" value="Define the port/layer configuration for CAM"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="denmPort"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="DenmSource"/>
-        <parameter id="description" value="Define the port/layer configuration for DENM"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="mapemSpatemPort"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="MapemSpatemSource"/>
-        <parameter id="description" value="Define the port/layer configuration for MAPEM-SPATEM"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="ivimPort"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="IvimSource"/>
-        <parameter id="description" value="Define the port/layer configuration for IVIM"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="sremSsemPort"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="SremSsemSource"/>
-        <parameter id="description" value="Define the port/layer configuration for SREM-SSEM"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="btpPort"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="BtpSource"/>
-        <parameter id="description" value="Define the port/layer configuration for BTP"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="geoNetworkingPort"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="GnSource"/>
-        <parameter id="description" value="Define the port/layer configuration for GeoNetworking"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="ipv6OverGeoNetworkingPort"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="Gn6Source"/>
-        <parameter id="description" value="Define the port/layer configuration for GeoNetworking over IPv6"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="v2gPort"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="Debug"/>
-        <parameter id="description" value="Define the port/layer configuration for V2G"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="UpperTesterSettings"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="192.168.56.11:2222"/>
-        <parameter id="description" value="Define the Upper Tester settings for communication with Upper Tester"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="LocalEthernetMAC"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="0025645B0CED"/>
-        <parameter id="description" value="Define the MAC address of the Ethernet interface connected to the IUT device"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="IutEthernetTypeValue"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="0x8947"/>
-        <parameter id="description" value="Define the Ethernet type value used by the IUT"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="LinkLayer_NodeA"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="BABEBABE0001"/>
-        <parameter id="description" value="Link-Layer address of component NodeA"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="LinkLayer_NodeB"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="BABEBABE0002"/>
-        <parameter id="description" value="Link-Layer address of component NodeB"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="LinkLayer_NodeC"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="BABEBABE0003"/>
-        <parameter id="description" value="Link-Layer address of component NodeC"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="LinkLayer_NodeD"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="BABEBABE0004"/>
-        <parameter id="description" value="Link-Layer address of component NodeD"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="LinkLayer_NodeE"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="BABEBABE0005"/>
-        <parameter id="description" value="Link-Layer address of component NodeE"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="LinkLayer_NodeF"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="BABEBABE0006"/>
-        <parameter id="description" value="Link-Layer address of component NodeF"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="Gn6RemoteAdapterIp"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="192.168.56.11"/>
-        <parameter id="description" value="IP address of GN6 remote Adapter"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="Gn6RemoteAdapterPort"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="42000"/>
-        <parameter id="description" value="UDP port of GN6 remote Adapter"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="TsBeaconInterval"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="1000"/>
-        <parameter id="description" value="Interval between each beacon sent by TS (ms)"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="TsLatitude"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="7000"/>
-        <parameter id="description" value="Latitude of Test System"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="TsLongitude"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="520000"/>
-        <parameter id="description" value="Longitude of Test System"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="V2gTsRole"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="SECC"/>
-        <parameter id="description" value="Is TS SECC or EVCC"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="V2gSeccAddress"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="FE80::1"/>
-        <parameter id="description" value="V2gSeccAddress"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="V2gSeccPort"/>
-        <parameter id="type" value="integer"/>
-        <parameter id="default" value="32000"/>
-        <parameter id="description" value="V2gSeccPort"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="UtSecuredMode"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="false"/>
-        <parameter id="description" value="UpperTester Secured mode status"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="TsSecuredRootPath"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default"/>
-        <parameter id="description" value="Secured root path to access certificates and private keys"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="TsSecuredConfiId"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default"/>
-        <parameter id="description" value="Secured configuration identifier"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="TsItsAidOther"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="38"/>
-        <parameter id="description" value="ITS-AID for other profile"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="GnssControllerAddress"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="192.168.89.106"/>
-        <parameter id="description" value="IP address of GNSS Controller"/>
-      </parameter>
-      <parameter id="taParamDeclaration" value="${LibItsCommon_Pixits.PICS_GNSS_SCENARIO_SUPPORT}">
-        <parameter id="name" value="GnssScenarioSupport"/>
-        <parameter id="type" value="boolean"/>
-        <parameter id="default">
-          <value>
-            <Values:boolean xmlns:Values="Values.xsd" type="boolean">
-              <Values:value>true</Values:value>
-            </Values:boolean>
-          </value>
-        </parameter>
-        <parameter id="description" value="Is GNSS scenario support available?"/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="GnssScenario_StaticPos"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="C:\Program Files (x86)\Spirent Communications\Positioning Application\Scenarios\C2C\StaticPos\StaticPos.scn"/>
-        <parameter id="description" value="Path to the GNSS scenario - static position."/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="GnssScenario_DynamicPos200m"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="C:\Program Files (x86)\Spirent Communications\Positioning Application\Scenarios\C2C\DynamicPos200m\DynamicPos200m.scn"/>
-        <parameter id="description" value="Path to the GNSS scenario - dynamic position 200m."/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="GnssScenario_DynamicPos1000m"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="C:\Program Files (x86)\Spirent Communications\Positioning Application\Scenarios\C2C\DynamicPos1000m\DynamicPos1000m.scn"/>
-        <parameter id="description" value="Path to the GNSS scenario - dynamic position 1000m."/>
-      </parameter>
-      <parameter id="taParamDeclaration">
-        <parameter id="name" value="GnssScenario_DynamicPos1500m"/>
-        <parameter id="type" value="charstring"/>
-        <parameter id="default" value="C:\Program Files (x86)\Spirent Communications\Positioning Application\Scenarios\C2C\DynamicPos1500m\DynamicPos1500m.scn"/>
-        <parameter id="description" value="Path to the GNSS scenario - dynamic position 1500m."/>
-      </parameter>
-    </parameter>
-    <parameter id="name" value="ITS System Adapter"/>
-    <parameter id="description" value="The ITS System Adapter providing the communication functionality to and from the SUT."/>
-  </extension>
 </plugin>
diff --git a/tt3plugins/TT_TestSystem_SA/TT3plugin.xml b/tt3plugins/TT_TestSystem_SA/TT3plugin.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d30157588fcbec0a96e8f2f1c52898f61e397bb
--- /dev/null
+++ b/tt3plugins/TT_TestSystem_SA/TT3plugin.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE plugin PUBLIC "-//TESTING TECH//DTD TT3plugin//2.0" "TT3plugin.dtd"> 
+<plugin id="com.testingtech.ttworkbench.sa" name="Testing Technologies TTworkbench Integration System Adapter" provider-name="Testing Technologies IST GmbH" version="1.0.0.0">
+  <runtime>
+    <library name="TT_TestSystem.jar"/>
+    <library name="../../build"/>
+  </runtime>
+  <dependency>
+  </dependency>
+  <extension point="com.testingtech.ttcn.tri.extension.PortPluginProvider">
+    <parameter id="class" value="org.etsi.its.tool.testingtech.PluginAdapter"/>
+    <parameter id="taParams">
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="DEBUG_ENABLED"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="ALL"/>
+        <parameter id="description" value="Set to ALL/INFO/OFF to activate full/medium/no traces"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="camPort"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="CamSource"/>
+        <parameter id="description" value="Define the port/layer configuration for CAM"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="denmPort"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="DenmSource"/>
+        <parameter id="description" value="Define the port/layer configuration for DENM"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="mapemSpatemPort"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="MapemSpatemSource"/>
+        <parameter id="description" value="Define the port/layer configuration for MAPEM-SPATEM"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="ivimPort"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="IvimSource"/>
+        <parameter id="description" value="Define the port/layer configuration for IVIM"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="sremSsemPort"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="SremSsemSource"/>
+        <parameter id="description" value="Define the port/layer configuration for SREM-SSEM"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="btpPort"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="BtpSource"/>
+        <parameter id="description" value="Define the port/layer configuration for BTP"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="geoNetworkingPort"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="GnSource"/>
+        <parameter id="description" value="Define the port/layer configuration for GeoNetworking"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="ipv6OverGeoNetworkingPort"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="Gn6Source"/>
+        <parameter id="description" value="Define the port/layer configuration for GeoNetworking over IPv6"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="v2gPort"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="Debug"/>
+        <parameter id="description" value="Define the port/layer configuration for V2G"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="UpperTesterSettings"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="192.168.56.11:2222"/>
+        <parameter id="description" value="Define the Upper Tester settings for communication with Upper Tester"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="LocalEthernetMAC"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="0025645B0CED"/>
+        <parameter id="description" value="Define the MAC address of the Ethernet interface connected to the IUT device"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="IutEthernetTypeValue"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="0x8947"/>
+        <parameter id="description" value="Define the Ethernet type value used by the IUT"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="LinkLayer_NodeA"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="BABEBABE0001"/>
+        <parameter id="description" value="Link-Layer address of component NodeA"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="LinkLayer_NodeB"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="BABEBABE0002"/>
+        <parameter id="description" value="Link-Layer address of component NodeB"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="LinkLayer_NodeC"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="BABEBABE0003"/>
+        <parameter id="description" value="Link-Layer address of component NodeC"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="LinkLayer_NodeD"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="BABEBABE0004"/>
+        <parameter id="description" value="Link-Layer address of component NodeD"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="LinkLayer_NodeE"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="BABEBABE0005"/>
+        <parameter id="description" value="Link-Layer address of component NodeE"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="LinkLayer_NodeF"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="BABEBABE0006"/>
+        <parameter id="description" value="Link-Layer address of component NodeF"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="Gn6RemoteAdapterIp"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="192.168.56.11"/>
+        <parameter id="description" value="IP address of GN6 remote Adapter"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="Gn6RemoteAdapterPort"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="42000"/>
+        <parameter id="description" value="UDP port of GN6 remote Adapter"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="TsBeaconInterval"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="1000"/>
+        <parameter id="description" value="Interval between each beacon sent by TS (ms)"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="TsLatitude"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="7000"/>
+        <parameter id="description" value="Latitude of Test System"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="TsLongitude"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="520000"/>
+        <parameter id="description" value="Longitude of Test System"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="V2gTsRole"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="SECC"/>
+        <parameter id="description" value="Is TS SECC or EVCC"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="V2gSeccAddress"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="FE80::1"/>
+        <parameter id="description" value="V2gSeccAddress"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="V2gSeccPort"/>
+        <parameter id="type" value="integer"/>
+        <parameter id="default" value="32000"/>
+        <parameter id="description" value="V2gSeccPort"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="UtSecuredMode"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="false"/>
+        <parameter id="description" value="UpperTester Secured mode status"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="TsSecuredRootPath"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default"/>
+        <parameter id="description" value="Secured root path to access certificates and private keys"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="TsSecuredConfiId"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default"/>
+        <parameter id="description" value="Secured configuration identifier"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="TsItsAidOther"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="38"/>
+        <parameter id="description" value="ITS-AID for other profile"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="GnssControllerAddress"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="192.168.89.106"/>
+        <parameter id="description" value="IP address of GNSS Controller"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="GnssScenarioSupport"/>
+        <parameter id="type" value="boolean"/>
+        <parameter id="default">
+          <value>
+            <Values:boolean xmlns:Values="Values.xsd" type="boolean">
+              <Values:value>true</Values:value>
+            </Values:boolean>
+          </value>
+        </parameter>
+        <parameter id="description" value="Is GNSS scenario support available?"/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="GnssScenario_StaticPos"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="C:\Program Files (x86)\Spirent Communications\Positioning Application\Scenarios\C2C\StaticPos\StaticPos.scn"/>
+        <parameter id="description" value="Path to the GNSS scenario - static position."/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="GnssScenario_DynamicPos200m"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="C:\Program Files (x86)\Spirent Communications\Positioning Application\Scenarios\C2C\DynamicPos200m\DynamicPos200m.scn"/>
+        <parameter id="description" value="Path to the GNSS scenario - dynamic position 200m."/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="GnssScenario_DynamicPos1000m"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="C:\Program Files (x86)\Spirent Communications\Positioning Application\Scenarios\C2C\DynamicPos1000m\DynamicPos1000m.scn"/>
+        <parameter id="description" value="Path to the GNSS scenario - dynamic position 1000m."/>
+      </parameter>
+      <parameter id="taParamDeclaration">
+        <parameter id="name" value="GnssScenario_DynamicPos1500m"/>
+        <parameter id="type" value="charstring"/>
+        <parameter id="default" value="C:\Program Files (x86)\Spirent Communications\Positioning Application\Scenarios\C2C\DynamicPos1500m\DynamicPos1500m.scn"/>
+        <parameter id="description" value="Path to the GNSS scenario - dynamic position 1500m."/>
+      </parameter>
+    </parameter>
+    <parameter id="name" value="ITS System Adapter"/>
+    <parameter id="description" value="The ITS System Adapter providing the communication functionality to and from the SUT."/>
+  </extension>
+</plugin>