diff --git a/STF525.tpd b/STF525.tpd
index c43561356528b35b3465b7413f9c4501bc472c3f..7eb0418b9ef4f7db28075c35667bc41a89494445 100644
--- a/STF525.tpd
+++ b/STF525.tpd
@@ -8,10 +8,9 @@
 -->
   <ProjectName>STF525</ProjectName>
   <ReferencedProjects>
-    <ReferencedProject name="Abstract_Socket_CNL113384" projectLocationURI="../../frameworks/titan/modules/titan.TestPorts.Common_Components.Abstract_Socket/Abstract_Socket_CNL113384.tpd" tpdName="Abstract_Socket_CNL113384.tpd"/>
+    <ReferencedProject name="Abstract_Socket_CNL113384" projectLocationURI="../../../Titan/titan.TestPorts.Common_Components.Abstract_Socket/Abstract_Socket_CNL113384.tpd" tpdName="Abstract_Socket_CNL113384.tpd"/>
   </ReferencedProjects>
   <Folders>
-    <FolderResource projectRelativePath="Workspace" relativeURI="../Workspace/STF525/Workspace"/>
     <FolderResource projectRelativePath="asn1" relativeURI="asn1"/>
     <FolderResource projectRelativePath="ccsrc" relativeURI="ccsrc"/>
     <FolderResource projectRelativePath="data" relativeURI="data"/>
diff --git a/STF525_Auto_Interop.tpd b/STF525_Auto_Interop.tpd
index 016428cd012de701eef410b1852025289b20ccd4..562eea7479bfdd9d20d6a1a5a40babdab1da8e28 100644
--- a/STF525_Auto_Interop.tpd
+++ b/STF525_Auto_Interop.tpd
@@ -2716,6 +2716,13 @@
             <listItem>/Users/yann/Documents/wireshark/cygwin64/usr/local/share</listItem>
             <listItem>/Users/yann/Documents/wireshark/cygwin64/usr/local/share/asn1c</listItem>
             <listItem>/Users/yann/Documents/wireshark/cygwin64/usr/lib/gcc/x86_64-pc-cygwin/7.3.0/include/c++</listItem>
+            <listItem>./src/ccsrc/Ports/LibIts_ports/BTP_ports</listItem>
+            <listItem>./src/ccsrc/Ports/LibIts_ports/CAM_ports</listItem>
+            <listItem>./src/ccsrc/Ports/LibIts_ports/DENM_ports</listItem>
+            <listItem>./src/ccsrc/Ports/LibIts_ports/GN_ports</listItem>
+            <listItem>./src/ccsrc/Ports/LibIts_ports/IVIM_ports</listItem>
+            <listItem>./src/ccsrc/Ports/LibIts_ports/MapemSpatem</listItem>
+            <listItem>./src/ccsrc/Ports/LibIts_ports/SremSsem_ports</listItem>
           </preprocessorIncludes>
           <disableBER>false</disableBER>
           <disableRAW>false</disableRAW>
diff --git a/asn1/Makefile b/asn1/Makefile
index 37c6250311337f007f4f40b30c4343f1d62f58ae..8ddda26007baa5883052f5dadde9621e81aae905 100644
--- a/asn1/Makefile
+++ b/asn1/Makefile
@@ -92,7 +92,7 @@ ASN_CONVERTER_SOURCES := \
 CONVERTER_OBJS=${ASN_CONVERTER_SOURCES:.c=.o}
 CFLAGS += $(ASN_MODULE_CFLAGS) -DPDU=CAM -DASN_PDU_COLLECTION -fPIC -I.
 
-all: $(CONVERTER)
+all: Makefile $(CONVERTER)
 
 $(LIB_MAKEFILE): $(addprefix $(ASN_DIR)/, $(ASN_FILES))
 	$(ASN1C) -gen-PER -gen-OER $(addprefix -pdu=,$(PDU)) -fcompound-names $^
@@ -117,5 +117,8 @@ regen: clear-asn1c $(LIB_MAKEFILE)
 clear-asn1c:
 	rm -f $(LIB_MAKEFILE)
 
+Makefile: $(ASN_DIR)/Makefile
+	echo ASN_DIR=$(ASN_DIR) > $@
+	cat $<                  >>$@
 ##########################################################
 endif
diff --git a/ccsrc/Ports/LibIts_ports/AdapterControlPort.cc b/ccsrc/Ports/LibIts_ports/AdapterControlPort.cc
index 05e79be7d5d90aae1960352998c01edb608762b9..2e0be2427c8c24a8a4c9c2677f47b3ff9185044b 100644
--- a/ccsrc/Ports/LibIts_ports/AdapterControlPort.cc
+++ b/ccsrc/Ports/LibIts_ports/AdapterControlPort.cc
@@ -1,15 +1,18 @@
 #include "AdapterControlPort.hh"
 
+#ifdef _NO_SOFTLINKS_
+/* to be used when built without generating softlinks to the working directory */
 //#include "CALM_ports/AdapterControlPort_CALM.partC"
-/* to be used when built without generating softlinks to the working directory
 #include "CAM_ports/AdapterControlPort_CAM.partC"
 #include "DENM_ports/AdapterControlPort_DENM.partC"
 #include "GN_ports/AdapterControlPort_GN.partC"
 #include "IVIM_ports/AdapterControlPort_IVIM.partC"
 #include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC"
 #include "SremSsem_ports/AdapterControlPort_SremSsem.partC"
-#include "V2G_ports/AdapterControlPort_V2G.partC"
-*/
+//#include "V2G_ports/AdapterControlPort_V2G.partC"
+
+#else //_NO_SOFTLINKS_
+
 #include "AdapterControlPort_CAM.partC"
 #include "AdapterControlPort_DENM.partC"
 #include "AdapterControlPort_IVIM.partC"
@@ -24,3 +27,4 @@
 */
 //#include "AdapterControlPort_V2G.partC"
 
+#endif //_NO_SOFTLINKS_
diff --git a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh
index e4cd45c86bc714ad806cb779b82aab21894d926f..38a51fe6e77b596c82f1e2ca57abd2ed4d46a8b4 100644
--- a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh
+++ b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh
@@ -3,16 +3,19 @@
 
 //#include "TRI_mapper_API.hh"
 
+#ifdef _NO_SOFTLINKS_
+/* to be used when built without generating softlinks to the working directory */
 //#include "CALM_ports/AdapterControlPort_CALM.partH"
-/* to be used when built without generating softlinks to the working directory
 #include "CAM_ports/AdapterControlPort_CAM.partH"
 #include "DENM_ports/AdapterControlPort_DENM.partH"
 #include "GN_ports/AdapterControlPort_GN.partH"
 #include "IVIM_ports/AdapterControlPort_IVIM.partH"
 #include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.partH"
 #include "SremSsem_ports/AdapterControlPort_SremSsem.partH"
-#include "V2G_ports/AdapterControlPort_V2G.partH"
-*/
+//#include "V2G_ports/AdapterControlPort_V2G.partH"
+
+#else //_NO_SOFTLINKS_
+
 #include "AdapterControlPort_CAM.partH"
 #include "AdapterControlPort_DENM.partH"
 #include "AdapterControlPort_IVIM.partH"
@@ -26,5 +29,5 @@
 #include "AdapterControlPort_Evcsn.partH"
 */
 //#include "AdapterControlPort_V2G.partH"
-
+#endif //_NO_SOFTLINKS_
 #endif
diff --git a/ccsrc/Ports/LibIts_ports/BTP_ports/BtpPort.cc b/ccsrc/Ports/LibIts_ports/BTP_ports/BtpPort.cc
index 9408f32bc90a20f1fb07add0f3578bc3faa03c03..82f01aa7712afc2abb17d21afae0c20a7f1e38fc 100644
--- a/ccsrc/Ports/LibIts_ports/BTP_ports/BtpPort.cc
+++ b/ccsrc/Ports/LibIts_ports/BTP_ports/BtpPort.cc
@@ -82,7 +82,7 @@ namespace LibItsBtp__TestSystem {
   }
 
   void BtpPort::outgoing_send(const BtpReq& send_par) {
-    loggers::get_instance().log_msg(">>> BtpPort::outgoing_send: payload=", send_par);
+//    loggers::get_instance().log_msg(">>> BtpPort::outgoing_send: payload=", send_par);
     
     float duration;
     loggers::get_instance().set_start_time(_time_key);
@@ -91,7 +91,7 @@ namespace LibItsBtp__TestSystem {
   }
 
   void BtpPort::receiveMsg(const LibItsBtp__TestSystem::BtpInd& p_ind, const params& p_params) {
-    loggers::get_instance().log_msg(">>> BtpPort::receive_msg: ", p_ind);
+//    loggers::get_instance().log_msg(">>> BtpPort::receive_msg: ", p_ind);
 
     incoming_message(p_ind);
   }
diff --git a/ccsrc/Ports/LibIts_ports/DENM_ports/DenmPort.cc b/ccsrc/Ports/LibIts_ports/DENM_ports/DenmPort.cc
index 781623d4f9b224e5164adc71985e68f6def28509..0a07c4103661836927f6ad02cc6817362cd27bf6 100644
--- a/ccsrc/Ports/LibIts_ports/DENM_ports/DenmPort.cc
+++ b/ccsrc/Ports/LibIts_ports/DENM_ports/DenmPort.cc
@@ -91,7 +91,7 @@ namespace LibItsDenm__TestSystem {
 
   void DenmPort::outgoing_send(const DenmReq& send_par)
   {
-    loggers::get_instance().log_msg(">>> DenmPort::outgoing_send: payload=", send_par);
+//    loggers::get_instance().log_msg(">>> DenmPort::outgoing_send: payload=", send_par);
     
     float duration;
     loggers::get_instance().set_start_time(_time_key);
@@ -101,7 +101,7 @@ namespace LibItsDenm__TestSystem {
   }
 
   void DenmPort::receiveMsg(const LibItsDenm__TestSystem::DenmInd& p_ind, const params& p_params) {
-    loggers::get_instance().log_msg(">>> DenmPort::receive_msg: ", p_ind);
+//    loggers::get_instance().log_msg(">>> DenmPort::receive_msg: ", p_ind);
 
     incoming_message(p_ind);
   }
diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.cc b/ccsrc/Ports/LibIts_ports/UpperTesterPort.cc
index 31f6ff1e342b0ba1f970c8d209c154ef584df0f1..0a0f2933682e7854770bcc02d42f16b9e46ea7a1 100644
--- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.cc
+++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.cc
@@ -2,22 +2,24 @@
 
 #include "UpperTesterPort.hh"
 
-/* to be used when built without generating softlinks to the working directory
+#ifdef _NO_SOFTLINKS_
+/* to be used when built without generating softlinks to the working directory */
 #include "BTP_ports/UpperTesterPort_BTP.partC"
 #include "CAM_ports/UpperTesterPort_CAM.partC"
 #include "DCC_ports/UpperTesterPort_DCC.partC"
 #include "DENM_ports/UpperTesterPort_DENM.partC"
 #include "GN_ports/UpperTesterPort_GN.partC"
 #include "IVIM_ports/UpperTesterPort_IVIM.partC"
-#include "MapSpat_ports/UpperTesterPort_MapSpat.partC"
+//#include "MapSpat_ports/UpperTesterPort_MapSpat.partC"
 #include "MapemSpatem_ports/UpperTesterPort_MapemSpatem.partC"
 #include "SremSsem_ports/UpperTesterPort_SremSsem.partC"
-#include "V2G_ports/UpperTesterPort_V2G.partC"
-*/
+//#include "V2G_ports/UpperTesterPort_V2G.partC"
+
+#else //_NO_SOFTLINKS_
 
 #include "UpperTesterPort_BTP.partC"
 #include "UpperTesterPort_CAM.partC"
-//#include "UpperTesterPort_DCC.partC"
+#include "UpperTesterPort_DCC.partC"
 #include "UpperTesterPort_DENM.partC"
 #include "UpperTesterPort_IVIM.partC"
 #include "UpperTesterPort_MapemSpatem.partC"
@@ -31,3 +33,4 @@
 #include "UpperTesterPort_Evcsn.partC"
 //#include "UpperTesterPort_V2G.partC"
 */
+#endif //_NO_SOFTLINKS_
diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh
index 5cc2ce86a652ce37c934f2feadb67b1f263784ff..8187de4814a27fe408970af69490e8afba861072 100644
--- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh
+++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh
@@ -4,22 +4,24 @@
 #include "LibItsCommon_TypesAndValues.hh"
 //#include "TRI_mapper_API.hh"
 //#include "TTCN_EncDec.hh"
-
-/* to be used when built without generating softlinks to the working directory
+#ifdef _NO_SOFTLINKS_
+/* to be used when built without generating softlinks to the working directory */
 #include "BTP_ports/UpperTesterPort_BTP.partH"
 #include "CAM_ports/UpperTesterPort_CAM.partH"
 #include "DCC_ports/UpperTesterPort_DCC.partH"
 #include "DENM_ports/UpperTesterPort_DENM.partH"
 #include "GN_ports/UpperTesterPort_GN.partH"
 #include "IVIM_ports/UpperTesterPort_IVIM.partH"
-#include "MapSpat_ports/UpperTesterPort_MapSpat.partH"
+//#include "MapSpat_ports/UpperTesterPort_MapSpat.partH"
 #include "MapemSpatem_ports/UpperTesterPort_MapemSpatem.partH"
 #include "SremSsem_ports/UpperTesterPort_SremSsem.partH"
-#include "V2G_ports/UpperTesterPort_V2G.partH"
-*/
+//#include "V2G_ports/UpperTesterPort_V2G.partH"
+
+#else //_NO_SOFTLINKS_
+
 #include "UpperTesterPort_BTP.partH"
 #include "UpperTesterPort_CAM.partH"
-//#include "UpperTesterPort_DCC.partH"
+#include "UpperTesterPort_DCC.partH"
 #include "UpperTesterPort_DENM.partH"
 #include "UpperTesterPort_IVIM.partH"
 #include "UpperTesterPort_MapemSpatem.partH"
@@ -33,4 +35,6 @@
 #include "UpperTesterPort_Evcsn.partH"
 //#include "UpperTesterPort_V2G.partH"
 */
+#endif//_NO_SOFTLINKS_
+
 #endif
diff --git a/data/v3/Makefile b/data/v3/Makefile
index 80d79fc91ab13d48c2407fd368d6ef17565cb624..fede62a231801cd47a0f6f22659a53c9693321a2 100644
--- a/data/v3/Makefile
+++ b/data/v3/Makefile
@@ -1,42 +1,48 @@
-outdir=certificates
-in=profiles
-xerdir=xer
-depdir=temp
-keydir=certificates
-
-ifeq ($(ARCH),)
- ARCH = $(shell gcc -dumpmachine)-d
-endif
-
-asn1certgen=../../tools/itscertgen/build/$(ARCH)/asn1certgen
-#asn1certgen=../../tools/itscertgen/build/msvc/x64/Debug/asn1certgen.exe
-
-#asn1certgen=../../tools/itscertgen/build/msvc/Debug/asn1certgen
-xsl_cvt=../../tools/itscertgen/asn1certgen/asn1certgen.xslt
-xsl_dep=../../tools/itscertgen/asn1certgen/prof2dep.xsl
-
-profiles=$(wildcard $(in)/*.xml)
-certificates_oer=$(patsubst $(in)/%.xml, $(outdir)/%.oer, $(profiles))
-certificates_xer=$(patsubst $(in)/%.xml, $(xerdir)/%.xer, $(profiles))
-deps=$(patsubst $(in)/%.xml, $(depdir)/%.dep, $(profiles))
-
-all: $(sort $(outdir) $(xerdir) $(depdir)) $(certificates_oer)
-
-$(sort $(outdir) $(xerdir) $(depdir)):
-	mkdir -p $@
-clear:
-	rm -f $(certificates_oer) $(certificates_xer)
-
-$(certificates_xer): $(xerdir)/%.xer : $(in)/%.xml
-	xsltproc $(xsl_cvt) $< | xmllint --format -o $@ -
-
-$(certificates_oer): $(outdir)/%.oer : $(xerdir)/%.xer 
-	$(asn1certgen) -o $(outdir) -K $(keydir) $<
-
-$(deps): $(depdir)/%.dep : $(in)/%.xml
-	-mkdir -p $(depdir)
-	xsltproc --param profile "'$*'" -o $@ $(xsl_dep) $<
-
-$(certificates_xer) : $(xsl_cvt)
-
-include $(deps)
+ifeq ($(ARCH),)
+ ARCH = $(shell gcc -dumpmachine)
+else
+ ifeq ($(OS),Windows_NT)
+   ARCH=msvc
+ endif
+endif
+
+outdir=certificates
+in=profiles
+xerdir=xer
+depdir=temp
+keydir=certificates
+
+ifeq ($(ARCH),msvc)
+  asn1certgen=../../tools/itscertgen/build/msvc/x64/Debug/asn1certgen.exe
+else
+  asn1certgen=../../tools/itscertgen/build/$(ARCH)-d/asn1certgen.exe
+endif
+
+xsl_cvt=../../tools/itscertgen/asn1certgen/asn1certgen.xslt
+xsl_dep=../../tools/itscertgen/asn1certgen/prof2dep.xsl
+
+profiles=$(wildcard $(in)/*.xml)
+certificates_oer=$(patsubst $(in)/%.xml, $(outdir)/%.oer, $(profiles))
+certificates_xer=$(patsubst $(in)/%.xml, $(xerdir)/%.xer, $(profiles))
+deps=$(patsubst $(in)/%.xml, $(depdir)/%.dep, $(profiles))
+
+all: $(sort $(outdir) $(xerdir) $(depdir)) $(certificates_oer)
+
+$(sort $(outdir) $(xerdir) $(depdir)):
+	mkdir -p $@
+clean:
+	rm -f $(certificates_oer) $(certificates_xer)
+
+$(certificates_xer): $(xerdir)/%.xer : $(in)/%.xml
+	xsltproc $(xsl_cvt) $< | xmllint --format -o $@ -
+
+$(certificates_oer): $(outdir)/%.oer : $(xerdir)/%.xer 
+	$(asn1certgen) -o $(outdir) -K $(keydir) $<
+
+$(deps): $(depdir)/%.dep : $(in)/%.xml
+	-mkdir -p $(depdir)
+	xsltproc --param profile "'$*'" -o $@ $(xsl_dep) $<
+
+$(certificates_xer) : $(xsl_cvt)
+
+include $(deps)