diff --git a/javasrc/adapter/org/etsi/its/adapter/Management.java b/javasrc/adapter/org/etsi/its/adapter/Management.java
index bd1008acbde61e693da367ec458bba7070db8bfc..08b5efc19cc90ad2df1385076d19b3f5c3cfbdaf 100644
--- a/javasrc/adapter/org/etsi/its/adapter/Management.java
+++ b/javasrc/adapter/org/etsi/its/adapter/Management.java
@@ -84,7 +84,7 @@ public class Management implements IManagementTA, IManagementLayers {
     /**
      * ITS-AID for Secure other profile 
      */
-    private static final String TsItsAidOther = ((CharstringValue)TERFactory.getInstance().getTaParameter("TsItsAidOther")).getString();
+    private static final String TsItsAidOther = "141"; // GN-MGMT ((CharstringValue)TERFactory.getInstance().getTaParameter("TsItsAidOther")).getString();
     
     /**
      * Link-layer address of Component
diff --git a/javasrc/adapter/org/etsi/its/adapter/PcapMultiplexer.java b/javasrc/adapter/org/etsi/its/adapter/PcapMultiplexer.java
index e4c701b1a12bf2bb1965f46ea573b4c7003d4b24..7f97453b124d93f6ab6570987339bb54f72ee150 100644
--- a/javasrc/adapter/org/etsi/its/adapter/PcapMultiplexer.java
+++ b/javasrc/adapter/org/etsi/its/adapter/PcapMultiplexer.java
@@ -51,7 +51,7 @@ public class PcapMultiplexer implements Runnable {
             
                               
             int r = Pcap.findAllDevs(alldevs, errbuf);  
-            if (r == Pcap.NOT_OK || alldevs.isEmpty()) {  
+            if (r != Pcap.OK || alldevs.isEmpty()) {  
               TERFactory.getInstance().logError("Can't read list of devices, error is %s" + errbuf.toString());  
               return;  
             }  
diff --git a/javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java b/javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java
index 9e3a5bba929b4ed48918a9b1734460b0166fbc5a..513bd1c116fd1bdf53007dbb98201be7b86b8443 100644
--- a/javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java
+++ b/javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java
@@ -115,7 +115,7 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable {
         // UDP socket for communication with UT
         running = true;
         try {
-            utSocket = new DatagramSocket();
+            utSocket = new DatagramSocket(/*utPeerPort*/);
             utThread = new UdpThread(utSocket);
             utThread.start();
         } catch (Exception e) {
@@ -125,8 +125,7 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable {
     
     @Override
     public boolean send(final byte[] message) {
-        if (_offlineMode.equals("true")) {
-/* FIXME: For debug only. Uncomment if no UT*/
+        if (/*true or */_offlineMode.equals("true")) { /* FIXME: For debug only. Uncomment if no UT - Do not forget the return true below*/
             try {
                 Thread.sleep(500);
             } catch (InterruptedException e) {
@@ -202,7 +201,7 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable {
             }
             notifyObservers(new PortEvent(rsp, getPortName(), getComponentName()));
         }
-/*        if(true)
+/* FIXME: For debug only       if(true)
             return true;
 */
         try {
@@ -283,8 +282,8 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable {
                             notifyObservers(new PortEvent(payload, getPortName(), getComponentName()));
                         } // else, packet was dropped
                     } else { // Notify received payload
-                    setChanged();
-                    notifyObservers(new PortEvent(ByteHelper.extract(packet.getData(), packet.getOffset(), packet.getLength()), getPortName(), getComponentName()));
+                        setChanged();
+                        notifyObservers(new PortEvent(ByteHelper.extract(packet.getData(), packet.getOffset(), packet.getLength()), getPortName(), getComponentName()));
                     }
                 } catch (IOException e) {
                     running = false;
diff --git a/javasrc/codec/org/etsi/ttcn/codec/CodecBuffer.java b/javasrc/codec/org/etsi/ttcn/codec/CodecBuffer.java
index 30f0c1dfc96fba0e18e196c923c5925b54f3a479..016c9ee241dcf46f06333a4e53faad493c17b8e7 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/CodecBuffer.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/CodecBuffer.java
@@ -9,7 +9,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.etsi.adapter.TERFactory;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 
 public class CodecBuffer {
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/CodecFactory.java b/javasrc/codec/org/etsi/ttcn/codec/CodecFactory.java
index 3bee2a9170135dc957d187236af1e72aa8d19347..90892f875a389b39e37e448d177340b2b6653bdf 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/CodecFactory.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/CodecFactory.java
@@ -82,7 +82,8 @@ public class CodecFactory {
         codec = externalCodecs.get(encoding);
         if(codec != null) {
             //TERFactory.getInstance().logDebug(String.format("%50s", encoding));
-            //TERFactory.getInstance().logDebug(" ==> " + codec.getClass().getName());      
+            //TERFactory.getInstance().logDebug(" ==> " + codec.getClass().getName());
+            System.out.println(String.format("%50s", encoding) + " ==> " + codec.getClass().getName());
             return codec;
         }
         return null;
@@ -91,10 +92,12 @@ public class CodecFactory {
     public ICodec getCodec(MainCodec mainCodec, int classType, String encoding, String typeName) {
 
         //TERFactory.getInstance().logDebug(String.format("%50s", typeName + "(" + encoding + ")"));
+        System.out.println(String.format("%50s", typeName + "(" + encoding + ")"));
         Class<? extends ICodec> cls = null;
         Class<?>[] ctorParams = {MainCodec.class};
 
         //TERFactory.getInstance().logDebug("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
+        System.out.println("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
         cls = codecs.get(classType + '/' + encoding + '/' + typeName);
         if(cls == null) {
             cls = codecs.get(classType + '/' + encoding + '/');
@@ -105,6 +108,7 @@ public class CodecFactory {
 
         if(cls != null) {
             //TERFactory.getInstance().logDebug(" ==> " + cls.getName());
+            System.out.println(" ==> " + cls.getName());
             try {
                 Constructor<? extends ICodec> ctor = cls.getConstructor(ctorParams);
                 return ctor.newInstance(mainCodec);
@@ -114,7 +118,8 @@ public class CodecFactory {
             }
         }
 
-        //TERFactory.getInstance().logDebug(" ==> No codec found !");      
+        //TERFactory.getInstance().logDebug(" ==> No codec found !");
+        System.out.println(" ==> No codec found !");
         return new Dummy(mainCodec);
     }
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/MainCodec.java b/javasrc/codec/org/etsi/ttcn/codec/MainCodec.java
index 617aaf66a5b087d4e808a7bd8c4fa8d900357714..861b0dbce79ffc72dd7c500fc3609ec026ba6193 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/MainCodec.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/MainCodec.java
@@ -22,14 +22,10 @@ public class MainCodec extends ICodec {
     }
 
     public Value triDecode(TriMessage message, Type decodingHypothesis) {
-//        TERFactory.getInstance().logDebug("############################################################################################");
-        
         return decode(new CodecBuffer(message.getEncodedMessage()), decodingHypothesis);
     }
 
     public TriMessage triEncode(Value value) {
-//        TERFactory.getInstance().logDebug("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
-        
         CodecBuffer encoded = encode(value);
         encoded.runCallbacks();
         return new TriMessageImpl(encoded.getBytes());
diff --git a/javasrc/codec/org/etsi/ttcn/codec/generic/Enumerated.java b/javasrc/codec/org/etsi/ttcn/codec/generic/Enumerated.java
index 63d280984ca56c79ab7a27a79038c4349270d06a..3b9e00ff9078935d3c2dd668ea96966907f6abe8 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/generic/Enumerated.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/generic/Enumerated.java
@@ -8,7 +8,7 @@ package org.etsi.ttcn.codec.generic;
 import org.etsi.ttcn.tci.Type;
 import org.etsi.ttcn.tci.Value;
 import org.etsi.ttcn.tci.EnumeratedValue;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.codec.ICodec;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.CodecBuffer;
diff --git a/javasrc/codec/org/etsi/ttcn/codec/generic/Float.java b/javasrc/codec/org/etsi/ttcn/codec/generic/Float.java
index c135f7da19af90de3505677c527986009022d9ba..66aae1f89815490d7838b86cfe57ded8f1abfd65 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/generic/Float.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/generic/Float.java
@@ -8,7 +8,7 @@ package org.etsi.ttcn.codec.generic;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.ICodec;
 import org.etsi.ttcn.codec.MainCodec;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.FloatValue;
 import org.etsi.ttcn.tci.Type;
 import org.etsi.ttcn.tci.Value;
diff --git a/javasrc/codec/org/etsi/ttcn/codec/generic/Integer.java b/javasrc/codec/org/etsi/ttcn/codec/generic/Integer.java
index 95ac15120c106b026d629a4ee54cb028baa82b78..e3cfe4654ce47d55cbe52a97a9a4cd06bc960743 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/generic/Integer.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/generic/Integer.java
@@ -12,7 +12,7 @@ import java.util.regex.Pattern;
 import org.etsi.ttcn.tci.Type;
 import org.etsi.ttcn.tci.Value;
 import org.etsi.ttcn.tci.IntegerValue;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.codec.ICodec;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.CodecBuffer;
diff --git a/javasrc/codec/org/etsi/ttcn/codec/ipv6/AnyIcmpv6Message.java b/javasrc/codec/org/etsi/ttcn/codec/ipv6/AnyIcmpv6Message.java
index 69fbe32d80f32777227ae9406dae25f4eef84f75..2d9656422ae16f7390d59c11eee9f4dd5770d2e8 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/ipv6/AnyIcmpv6Message.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/ipv6/AnyIcmpv6Message.java
@@ -7,7 +7,7 @@ import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.IMarkerCallback;
 
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 
 public class AnyIcmpv6Message extends Record implements IMarkerCallback {
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/ipv6/Ipv6ExtHdr.java b/javasrc/codec/org/etsi/ttcn/codec/ipv6/Ipv6ExtHdr.java
index de40cb9c14ef9fbb1d10ee8e640391b11fc7b5f3..02d0bca443953b9c0f23eef1ac7321fc6165b9a7 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/ipv6/Ipv6ExtHdr.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/ipv6/Ipv6ExtHdr.java
@@ -7,7 +7,7 @@ import org.etsi.ttcn.codec.generic.Record;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.CodecBuffer;
 
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 
 public class Ipv6ExtHdr extends Record {
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/ipv6/Ipv6Header.java b/javasrc/codec/org/etsi/ttcn/codec/ipv6/Ipv6Header.java
index b469f3d8095fa4b801db8d33a42ee600ab9a343a..f88805ddb9c9db778c81fc835feec7a3e4df1e40 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/ipv6/Ipv6Header.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/ipv6/Ipv6Header.java
@@ -5,7 +5,7 @@ import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.IMarkerCallback;
 
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 
 public class Ipv6Header extends Record implements IMarkerCallback {
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcFsapPrimitive.java b/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcFsapPrimitive.java
index ef49daf256af310f4073de436cb9206a0b736f64..084fe339a70da4b163594f51dba97ec28c631f6d 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcFsapPrimitive.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcFsapPrimitive.java
@@ -8,7 +8,7 @@ package org.etsi.ttcn.codec.its.adapter;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.generic.Union;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.UnionValue;
 
 public class AcFsapPrimitive extends Union {
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnPrimitive.java b/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnPrimitive.java
index 3dfebd64db2476b02fcc54d40dab74118de72c4a..5002d3b4d47ed285fd9d2b02dfe22ce1bef2af6a 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnPrimitive.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnPrimitive.java
@@ -10,7 +10,7 @@ import org.etsi.ttcn.tci.UnionValue;
 import org.etsi.ttcn.codec.generic.Union;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.CodecBuffer;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 
 public class AcGnPrimitive extends Union {
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnResponse.java b/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnResponse.java
index e4c53ceb5b3fc9f7b7ed0e428adcd29c73735eae..e70a81848bf42f24d25bb8ad570df3e474a3f192 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnResponse.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnResponse.java
@@ -11,7 +11,7 @@ import org.etsi.ttcn.tci.UnionValue;
 import org.etsi.ttcn.codec.generic.Union;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.CodecBuffer;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 
 public class AcGnResponse extends Union {
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnssPrimitive.java b/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnssPrimitive.java
index aa57f2570eba11c2a2e45044849909cf62dafd17..0e987915ed626b6847269f026efc181a6538e095 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnssPrimitive.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcGnssPrimitive.java
@@ -5,7 +5,7 @@ import org.etsi.ttcn.tci.UnionValue;
 import org.etsi.ttcn.codec.generic.Union;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.CodecBuffer;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 
 public class AcGnssPrimitive extends Union {
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcSecPrimitive.java b/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcSecPrimitive.java
index b7ff2d1131b555d1e83b69030a1902be9738e180..d646b0671de3f682471a8db36bc6bc593bc598bf 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcSecPrimitive.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/adapter/AcSecPrimitive.java
@@ -3,7 +3,7 @@ package org.etsi.ttcn.codec.its.adapter;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.generic.Union;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.Type;
 import org.etsi.ttcn.tci.UnionValue;
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/CommonHeader.java b/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/CommonHeader.java
index e81b95fc3c940c7d45a13c45bc0ac2ae4e3f81d1..2e8fe51b6a98719803468dd42aff79b8b1c4533d 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/CommonHeader.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/CommonHeader.java
@@ -10,7 +10,7 @@ import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.IMarkerCallback;
 
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.EnumeratedValue;
 import org.etsi.ttcn.tci.IntegerValue;
 import org.etsi.ttcn.tci.RecordValue;
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/GeoNetworkingPacket.java b/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/GeoNetworkingPacket.java
index 961763ffc9aa88223d654fdbbe34736286e0745b..82f272d644d420e1b48b77890307ecaeff6e8ce4 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/GeoNetworkingPacket.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/GeoNetworkingPacket.java
@@ -8,7 +8,7 @@ package org.etsi.ttcn.codec.its.geonetworking;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.generic.Record;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.OctetstringValue;
 import org.etsi.ttcn.tci.RecordValue;
 import org.etsi.ttcn.tci.Type;
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/GnNonSecuredPacket.java b/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/GnNonSecuredPacket.java
index 875db85398bb8b836410992e5e77383752ddab5b..7143f481650cd70da158278544e8d927d3ea5358 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/GnNonSecuredPacket.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/geonetworking/GnNonSecuredPacket.java
@@ -8,7 +8,7 @@ package org.etsi.ttcn.codec.its.geonetworking;
 import org.etsi.ttcn.codec.generic.Record;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.CodecBuffer;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.RecordValue;
 import org.etsi.ttcn.tci.Type;
 import org.etsi.ttcn.tci.Value;
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/security/EccPoint.java b/javasrc/codec/org/etsi/ttcn/codec/its/security/EccPoint.java
index 19f8f8dcb631c67d91130f449d4ba37fec37f194..6a7602bc60be31777ccfe4561e8559bd774ab13a 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/security/EccPoint.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/security/EccPoint.java
@@ -8,7 +8,7 @@ package org.etsi.ttcn.codec.its.security;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.generic.Record;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.RecordValue;
 import org.etsi.ttcn.tci.Type;
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/security/ItsAidSsp.java b/javasrc/codec/org/etsi/ttcn/codec/its/security/ItsAidSsp.java
index ba59bacffe592c903a3c1cfbeebd0a91babfe6ab..9844279a1b5b08acd650e78cb898c3f7d691cdb9 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/security/ItsAidSsp.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/security/ItsAidSsp.java
@@ -16,14 +16,8 @@ public class ItsAidSsp extends Record {
     
     public ItsAidSsp(MainCodec mainCodec) {
         super(mainCodec);
-//        setLengths();
     }
 
-//    private void setLengths() {
-//        mainCodec.setHint("Bit2Len", "2"); 
-//        mainCodec.setHint("Bit3Len", "3"); 
-//    }
-//    
     @Override
     protected void postEncodeField(String fieldName, CodecBuffer buf) {
 //        TERFactory.getInstance().logDebug(">>> ItsAidSsp.postEncodeField: " + fieldName);
@@ -41,11 +35,15 @@ public class ItsAidSsp extends Record {
 //        TERFactory.getInstance().logDebug(">>> ItsAidSsp.preDecodeField: " + fieldName + ", " + decodingHypothesis.getName() + ", " + rv.getType().getName());
         
         if (fieldName.equals("service_specific_permissions")) {
-            int len = buf.readBits(Byte.SIZE)[0]; // FIXME It depends of the len value : <= 127 or > 127
-            // FIXME Check for opaque<var> length encoding
-            //int len = ByteHelper.byteArrayToInt(buf.readBits(Integer.SIZE)); // field_sizeLen is 1 bytes
-//            TERFactory.getInstance().logDebug("ItsAidSsp.preDecodeField: len = " + len);
-            mainCodec.setHint("Oct1to31Len", Integer.toString(len));
+            int len = buf.readBits(Byte.SIZE)[0]; // FIXME Should be IntX?
+//            TERFactory.getInstance().logDebug("ItsAidSsp.preDecodeField: len=" + len);
+            if (mainCodec.getHint("ServiceSpecificPermissionsContainer").equals("sspCAM")) {
+                mainCodec.setHint("SspCAMLen", Integer.toString(len - 1/* Version byte*/));
+            } else if (mainCodec.getHint("ServiceSpecificPermissionsContainer").equals("sspDENM")) {
+                mainCodec.setHint("SspDENMLen", Integer.toString(len -1/* Version byte*/));
+            } else {
+                mainCodec.setHint("ServiceSpecificPermissionsContainer.opaqueLen", Integer.toString(len - 1/* Version byte*/));
+            }
         }
     }
     
@@ -60,6 +58,21 @@ public class ItsAidSsp extends Record {
                 mainCodec.setHint("ServiceSpecificPermissionsContainer", "sspCAM");
             } else if (itsaid == 37) {
                 mainCodec.setHint("ServiceSpecificPermissionsContainer", "sspDENM");
+            } else if (itsaid == 138) {
+                mainCodec.setHint("ServiceSpecificPermissionsContainer", "opaque");
+                //mainCodec.setHint("ServiceSpecificPermissionsContainer", "sspMAPEM");
+            } else if (itsaid == 137) {
+                mainCodec.setHint("ServiceSpecificPermissionsContainer", "opaque");
+                //mainCodec.setHint("ServiceSpecificPermissionsContainer", "sspSPATEM");
+            } else if (itsaid == 139) {
+                mainCodec.setHint("ServiceSpecificPermissionsContainer", "opaque");
+                //mainCodec.setHint("ServiceSpecificPermissionsContainer", "sspIVIM");
+            } else if (itsaid == 140) {
+                mainCodec.setHint("ServiceSpecificPermissionsContainer", "opaque");
+                //mainCodec.setHint("ServiceSpecificPermissionsContainer", "sspSxEM");
+            } else if (itsaid == 141) {
+                mainCodec.setHint("ServiceSpecificPermissionsContainer", "opaque");
+                //mainCodec.setHint("ServiceSpecificPermissionsContainer", "sspGnMgmt");
             } else {
                 mainCodec.setHint("ServiceSpecificPermissionsContainer", "opaque");
             }
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/security/ServiceSpecificPermissions.java b/javasrc/codec/org/etsi/ttcn/codec/its/security/ServiceSpecificPermissions.java
index c0c2f97c7c0b769eef6d96923d9a5d2770839a0e..2dba0799749fa3b24eb956c68549000d3d9b4e38 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/security/ServiceSpecificPermissions.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/security/ServiceSpecificPermissions.java
@@ -8,7 +8,7 @@ package org.etsi.ttcn.codec.its.security;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.generic.Record;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.RecordValue;
 import org.etsi.ttcn.tci.Type;
 
@@ -33,20 +33,8 @@ public class ServiceSpecificPermissions extends Record {
     protected void preDecodeField(String fieldName, CodecBuffer buf, Type decodingHypothesis, RecordValue rv) {
 //        TERFactory.getInstance().logDebug(">>> ServiceSpecificPermissions.preDecodeField: " + fieldName + ", " + decodingHypothesis.getName() + ", " + rv.getType().getName());
         
-        if (fieldName.equals("version")) {
-            byte version = buf.getBytes(0, 1)[0];
-            switch (version) {
-                case (byte)0x01:
-                    mainCodec.setHint("version", String.valueOf(version)); 
-                    break;
-            } // End of 'switch' statement
-        } else if (fieldName.equals("sspContainer")) {
-            if (mainCodec.getHint("version") != null) {
-                mainCodec.setPresenceHint(fieldName, true);
-            } else {
-                mainCodec.setPresenceHint(fieldName, false);
-                
-            }
+        if (fieldName.equals("sspContainer")) {
+            mainCodec.setPresenceHint(fieldName, true);
         }
     }
     
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/security/SspCAM.java b/javasrc/codec/org/etsi/ttcn/codec/its/security/SspCAM.java
index 7b2eeeb98fabe4e1c184599bff0f54328c00ff7f..e146f7f51059f46990c516d19376b4af38c73662 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/security/SspCAM.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/security/SspCAM.java
@@ -3,7 +3,7 @@ package org.etsi.ttcn.codec.its.security;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.generic.Record;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.RecordValue;
 import org.etsi.ttcn.tci.Type;
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/security/SspDENM.java b/javasrc/codec/org/etsi/ttcn/codec/its/security/SspDENM.java
index cc30e7e315d7f3611d5c9faed3a8ce92496e4dd0..61aea6fa6bce71508f2dfe8800cec3e562703a7d 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/security/SspDENM.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/security/SspDENM.java
@@ -3,7 +3,7 @@ package org.etsi.ttcn.codec.its.security;
 import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.generic.Record;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.RecordValue;
 import org.etsi.ttcn.tci.Type;
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/security/TlsHelper.java b/javasrc/codec/org/etsi/ttcn/codec/its/security/TlsHelper.java
index d3f4a36e33bc15ff20322c5f6ab58dd8e88eb4a4..93e93adf88ed0b7d68a677e1ea3faca7a71e8778 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/security/TlsHelper.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/security/TlsHelper.java
@@ -6,7 +6,7 @@
 package org.etsi.ttcn.codec.its.security;
 
 import org.etsi.ttcn.codec.CodecBuffer;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 
 public class TlsHelper {
     
diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtPayload.java b/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtPayload.java
index 87817cfdea90d4744a47963eaaac98093b122448..66b0b69207ce50014b4433b4b6d30d8764ab00ab 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtPayload.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtPayload.java
@@ -9,7 +9,7 @@ import org.etsi.ttcn.codec.CodecBuffer;
 import org.etsi.ttcn.codec.IMarkerCallback;
 import org.etsi.ttcn.codec.MainCodec;
 import org.etsi.ttcn.codec.generic.Record;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.Value;
 
 public class UtPayload extends Record implements IMarkerCallback {
diff --git a/javasrc/codec/org/etsi/ttcn/common/ByteHelper.java b/javasrc/codec/org/etsi/ttcn/common/ByteHelper.java
deleted file mode 100644
index 51c347e8ef527f3f540661b3aa4fd519b20e2459..0000000000000000000000000000000000000000
--- a/javasrc/codec/org/etsi/ttcn/common/ByteHelper.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * @author      ETSI / STF462
- * @version     $URL$
- *              $Id$
- */
-package org.etsi.ttcn.common;
-
-import java.nio.ByteBuffer;
-
-import org.etsi.adapter.TERFactory;
-
-/* FIXME: to be merged with org.etsi.common.ByteHelper */
-public class ByteHelper {
-
-    public static byte[] intToByteArray(final int value, final int length) {
-        byte[] b = new byte[length];
-        for (int i = length - 1; i >= 0; i--) {
-            int offset = (b.length - 1 - i) * 8;
-            b[i] = (byte) ((value >>> offset) & 0xFF);
-        }
-        return b;
-    }
-
-    public static byte[] longToByteArray(final long value, final int length) {
-        byte[] b = new byte[length];
-        for (int i = length - 1; i >= 0; i--) {
-            int offset = (b.length - 1 - i) * 8;
-            b[i] = (byte) ((value >>> offset) & 0xFF);
-        }
-        return b;
-    }
-
-    public static byte[] floatToByteArray(final float value) {
-        return ByteBuffer.allocate(Float.SIZE / Byte.SIZE).putFloat(value).array();
-    }
-
-    /** Convert a byte array into an integer assuming that the first byte is the most significant
-     * 
-     * @param b The byte array to convert
-     * @return The integer value
-     */
-    public static Integer byteArrayToInt(final byte[] b) {
-        // Sanity check
-        if ((b == null) || ((b.length * Byte.SIZE) > Integer.SIZE)) {
-            return Integer.MAX_VALUE;
-        }
-
-        int value = 0;
-        for (int i = 0; i < b.length; i++) {
-            value = (value << 8) + (b[i] & 0xff);
-        }
-
-        return new Integer(value);
-    } // End of method byteArrayToInt
-    
-    /** Convert a byte array into a signed integer assuming that padding bits are in first byte
-     * 
-     * @param b The byte array to convert
-     * @param significantBits number of significant bits in the array
-     * @return The integer value
-     */
-    public static int byteArrayToSignedInt(final byte[] b, final int significantBits) {
-
-        int value = 0;
-        for (int i = 0; i < b.length; i++) {
-            value = (value << 8) + (b[i] & 0xff);
-        }
-        
-        int shift = 32 - significantBits;
-        
-        // Restore sign bit by shifting left and right
-        if(shift > 0) {
-            value <<= shift;
-            value >>= shift;
-        }
-
-        return new Integer(value);
-    }
-
-    /** Convert a byte array into a Long assuming that the first byte is the most significant
-     * 
-     * @param b The byte array to convert
-     * @return The Long value
-     */
-    public static Long byteArrayToLong(final byte[] b) {
-        // Sanity check
-        if ((b == null) || ((b.length * Byte.SIZE) > Long.SIZE)) {
-            return Long.MAX_VALUE;
-        }
-
-        long value = 0;
-        for (int i = 0; i < b.length; i++) {
-            value = (value << 8) + (b[i] & 0xff);
-        }
-
-        return new Long(value);
-    } // End of method byteArrayToLong
-
-    public static Float byteArrayToFloat(final byte[] b) {
-        return ByteBuffer.wrap(b).getFloat();
-    }
-
-    public static byte[] hexStringToByteArray(final String s) {
-        String str = "";
-        for(String ss : s.split("[^0-9A-Fa-f]")) {
-            str = str + ss;
-        }
-        int len = str.length();
-        byte[] data = new byte[len / 2];
-        for (int i = 0; i < len; i += 2) {
-            data[i / 2] = (byte) ((Character.digit(str.charAt(i), 16) << 4)
-                    + Character.digit(str.charAt(i+1), 16));
-        }
-        return data;
-    }
-
-    public static byte[] concat(byte[]... arrays) {
-        int length = 0;
-        for (byte[] array : arrays) {
-            if(array != null) {
-                length += array.length;
-            }
-        }
-        byte[] result = new byte[length];
-        int position = 0;
-        for (byte[] array : arrays) {
-            if(array != null) {
-                System.arraycopy(array, 0, result, position, array.length);
-                position += array.length;
-            }
-        }
-        return result;
-    }
-
-
-    /** Extract a sub part of a byte array
-     * @param array The original array
-     * @param offset The offset to start the extract operation
-     * @param length The number of bytes to extract
-     * @return The sub part of a provided byte array
-     */
-    public static byte[] extract(byte[] array, int offset, int length) {
-        // Sanity check
-        if ((array == null) || (offset > array.length)) {
-            return null;
-        }
-
-        byte[] result = new byte[length];
-        System.arraycopy(array, offset, result, 0, length);
-        return result;
-    }
-    
-    public static byte[] fill(final byte[] buffer, final int length, final byte pattern) {
-        byte[] result = new byte[length];
-        if (buffer == null) { // Fill it
-            for(int i = 0; i < length; ++i) {
-                result[i] = pattern;
-            } // End of 'for' statement
-        } else { // 
-            for(int i = 0; i < length - buffer.length; ++i) {
-                result[length - i - 1] = pattern;
-            } // End of 'for' statement
-            System.arraycopy(buffer, 0, result, 0, buffer.length);
-        }
-        
-        return result;
-    }
-    
-    /**
-     * Dump a byte array in hex/ascii mode.
-     * @param label The dump label
-     * @param buffer The byte array to dump
-     */
-    public synchronized static void dump(final String label, final byte[] buffer) 
-    {
-        if ((buffer != null) && (buffer.length != 0))
-        {
-            TERFactory.getInstance().logDebug(label);
-            StringBuilder finalHexLine = new StringBuilder();
-            StringBuilder finalCharLine = new StringBuilder();
-            int nCounter = 0;
-            int nOffset = 0;
-            // Flush header.
-            TERFactory.getInstance().logDebug(" HEX | 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F  : 0 1 2 3 4 5 6 7 8 9 A B C D E F ");
-            TERFactory.getInstance().logDebug("-----|+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+-:--+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+");
-            for (int i = 0; i < buffer.length; ++i)
-            {
-                byte c = (byte)buffer[i];
-
-                String fmtHex = String.format("%02x ", c);
-                String fmtChar = String.format("%c ", Character.isISOControl((char)c) || c < 0 ? '.' : (char)c);
-
-                if (nOffset % 16 == 0)
-                {
-                    finalHexLine.append(String.format("%05x| ", nOffset));
-                }
-
-                finalHexLine.append(fmtHex);
-                finalCharLine.append(fmtChar);
-                if (nCounter == 15)
-                {
-                    // Flush line.
-                    TERFactory.getInstance().logDebug(String.format("%s : %s", finalHexLine.toString(), finalCharLine.toString()));
-                    // Reset buffer.
-                    finalHexLine.delete(0, finalHexLine.length());
-                    finalCharLine.delete(0, finalCharLine.length());
-
-                    nCounter = 0;
-                }
-                else
-                {
-                    nCounter++;
-                }
-                nOffset++;
-            }
-            if (nCounter < 16)
-            {
-                // Pad till 15.
-                for (int i = nCounter; i < 16; i++)
-                {
-                    finalHexLine.append("   ");
-                    finalCharLine.append("  ");
-                }
-                // Flush line.
-                TERFactory.getInstance().logDebug(String.format("%s : %s", finalHexLine.toString(), finalCharLine.toString()));
-            }
-        }
-    }
-}
diff --git a/javasrc/common/org/etsi/common/ByteHelper.java b/javasrc/common/org/etsi/common/ByteHelper.java
index 50fe64716f82fc13c86ba881764b3fd3a466b4f0..dac128aa887b86cd1d0667efaca59bea4b07684a 100644
--- a/javasrc/common/org/etsi/common/ByteHelper.java
+++ b/javasrc/common/org/etsi/common/ByteHelper.java
@@ -286,14 +286,14 @@ public class ByteHelper {
     {
         if ((buffer != null) && (buffer.length != 0))
         {
-            TERFactory.getInstance().logDebug(label);
+            //TERFactory.getInstance().logDebug(label);
             StringBuilder finalHexLine = new StringBuilder();
             StringBuilder finalCharLine = new StringBuilder();
             int nCounter = 0;
             int nOffset = 0;
             // Flush header.
-            TERFactory.getInstance().logDebug(" HEX | 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F  : 0 1 2 3 4 5 6 7 8 9 A B C D E F ");
-            TERFactory.getInstance().logDebug("-----|+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+-:--+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+");
+            //TERFactory.getInstance().logDebug(" HEX | 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F  : 0 1 2 3 4 5 6 7 8 9 A B C D E F ");
+            //TERFactory.getInstance().logDebug("-----|+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+-:--+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+");
             for (int i = 0; i < buffer.length; ++i)
             {
                 byte c = (byte)buffer[i];
@@ -311,7 +311,7 @@ public class ByteHelper {
                 if (nCounter == 15)
                 {
                     // Flush line.
-                    TERFactory.getInstance().logDebug(String.format("%s : %s", finalHexLine.toString(), finalCharLine.toString()));
+                    //TERFactory.getInstance().logDebug(String.format("%s : %s", finalHexLine.toString(), finalCharLine.toString()));
                     // Reset buffer.
                     finalHexLine.delete(0, finalHexLine.length());
                     finalCharLine.delete(0, finalCharLine.length());
@@ -333,7 +333,7 @@ public class ByteHelper {
                     finalCharLine.append("  ");
                 }
                 // Flush line.
-                TERFactory.getInstance().logDebug(String.format("%s : %s", finalHexLine.toString(), finalCharLine.toString()));
+                //TERFactory.getInstance().logDebug(String.format("%s : %s", finalHexLine.toString(), finalCharLine.toString()));
             }
         }
     }
diff --git a/javasrc/tool/org/etsi/its/tool/elvior/Its_CodecProvider.java b/javasrc/tool/org/etsi/its/tool/elvior/Its_CodecProvider.java
index a2e1e90545114ff91f860e2566dfe088bef74346..ac565b82310cc9d7a0b80d261964659e17253566 100644
--- a/javasrc/tool/org/etsi/its/tool/elvior/Its_CodecProvider.java
+++ b/javasrc/tool/org/etsi/its/tool/elvior/Its_CodecProvider.java
@@ -33,7 +33,7 @@ public class Its_CodecProvider implements TciCDProvided, ChannelEventHandler, IT
     private CodecFactory _cf;
     
     public Its_CodecProvider() {
-        _logger.entering("Its_CodecProvider", "Its_CodecProvider");
+        //_logger.entering("Its_CodecProvider", "Its_CodecProvider");
         
         // Load Codec settings
         _cdReq = null;
@@ -56,9 +56,9 @@ public class Its_CodecProvider implements TciCDProvided, ChannelEventHandler, IT
             //TERFactory.getInstance().logError("Unsupported logging level: " + debugLevel); 
             level = Level.OFF;
         }
-        _logger.addHandler(new ConsoleHandler());
-        _logger.setLevel(level);
-        _logger.getHandlers()[0].setLevel(level);
+        //_logger.addHandler(new ConsoleHandler());
+        //_logger.setLevel(level);
+        //_logger.getHandlers()[0].setLevel(level);
         
         // Register this object as the instance implementing the TCI-CD Provided interface
         TciProvider.getInstance().setTciCDProvided(this);
@@ -89,15 +89,16 @@ public class Its_CodecProvider implements TciCDProvided, ChannelEventHandler, IT
             }
         } // End of 'for' loop
         
-        try {
-            _cf.setExternalCodec("per-basic-unaligned:1997", (TciCDProvided) Class.forName("org.etsi.its.tool.elvior.LibIts_asn1").newInstance());
-        } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
+        // TODO To be removed definitivelly
+//        try {
+//            _cf.setExternalCodec("per-basic-unaligned:1997", (TciCDProvided) Class.forName("org.etsi.its.tool.elvior.LibIts_asn1").newInstance());
+//        } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+//            e.printStackTrace();
+//        }
     }
     
     public void run() { 
-        _logger.entering("Its_CodecProvider", "run");
+        //_logger.entering("Its_CodecProvider", "run");
         
         // Attempt to connect to TestCast
         if (TriTciChannel.getInstance().open()) {
@@ -109,12 +110,12 @@ public class Its_CodecProvider implements TciCDProvided, ChannelEventHandler, IT
             }
         }
         
-        _logger.exiting("Its_CodecProvider", "run");
+        //_logger.exiting("Its_CodecProvider", "run");
     }
     
     @Override
     public void onConnectionClosed() {
-        _logger.entering("Its_CodecProvider", "onConnectionClosed");
+        //_logger.entering("Its_CodecProvider", "onConnectionClosed");
         synchronized(this) { 
             notify(); 
         }
@@ -122,22 +123,22 @@ public class Its_CodecProvider implements TciCDProvided, ChannelEventHandler, IT
     
     @Override
     public void onConnectionEstablished() {
-        _logger.entering("Its_CodecProvider", "onConnectionEstablished");
+        //_logger.entering("Its_CodecProvider", "onConnectionEstablished");
     }
     
     @Override
     public void onError(String error) {
-        _logger.entering("Its_CodecProvider", "onError", error);
+        //_logger.entering("Its_CodecProvider", "onError", error);
     }
     
     @Override
     public Value decode(TriMessage message, Type decodingHypothesis) {
-        _logger.entering(
+        /*_logger.entering(
             "decode", 
             String.format("%s - %s - %s", 
                 decodingHypothesis.getName(), 
                 decodingHypothesis.getTypeEncoding(), 
-                decodingHypothesis.getTypeClass()));
+                decodingHypothesis.getTypeClass()));*/
         String encodingName = decodingHypothesis.getTypeEncoding();
         if (encodingName != null) {
             encodingName = decodingHypothesis.getDefiningModule().getModuleName();
@@ -149,7 +150,7 @@ public class Its_CodecProvider implements TciCDProvided, ChannelEventHandler, IT
             return null;
         }
         Value value = codec.decode(message, decodingHypothesis);
-        _logger.exiting("Its_CodecProvider.decode", (value != null) ? GetValueStructure.getValueStructure(value) : "(null)");
+        //_logger.exiting("Its_CodecProvider.decode", (value != null) ? GetValueStructure.getValueStructure(value) : "(null)");
         return value;
     }
     
@@ -181,9 +182,9 @@ public class Its_CodecProvider implements TciCDProvided, ChannelEventHandler, IT
         if (codec == null) {
             return null;
         }
-        _logger.info("Value to encode: " + GetValueStructure.getValueStructure(value));
+        //_logger.info("Value to encode: " + GetValueStructure.getValueStructure(value));
         TriMessage res = codec.encode(value);
-        _logger.exiting("encode", res.toString());
+        //_logger.exiting("encode", res.toString());
         return res;
     }
     
@@ -204,7 +205,7 @@ public class Its_CodecProvider implements TciCDProvided, ChannelEventHandler, IT
 
         @Override
         public Value decode(TriMessage message, Type decodingHypothesis) {
-            _logger.entering("Codec", "decode", decodingHypothesis.getName());
+            //_logger.entering("Codec", "decode", decodingHypothesis.getName());
             
             org.etsi.ttcn.codec.MainCodec codec = new org.etsi.ttcn.codec.MainCodec(_cdReq);
             Value v = null;
@@ -219,7 +220,7 @@ public class Its_CodecProvider implements TciCDProvided, ChannelEventHandler, IT
 
         @Override
         public TriMessage encode(Value value) {
-            _logger.entering("Codec", "encode");
+            //_logger.entering("Codec", "encode");
             
             org.etsi.ttcn.codec.MainCodec codec = new org.etsi.ttcn.codec.MainCodec(_cdReq);
             TriMessage m = null;
diff --git a/javasrc/tool/org/etsi/its/tool/elvior/LibItsContainer_asn1.java b/javasrc/tool/org/etsi/its/tool/elvior/LibItsContainer_asn1.java
index 74064dc144686f9f9db477306443b8a622d29878..bb6010a250ea408b92eec8635aff078ba477fddb 100644
--- a/javasrc/tool/org/etsi/its/tool/elvior/LibItsContainer_asn1.java
+++ b/javasrc/tool/org/etsi/its/tool/elvior/LibItsContainer_asn1.java
@@ -1,7 +1,7 @@
 package org.etsi.its.tool.elvior;
 
 import org.elvior.ttcn.tritci.TriProvider;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.Type;
 import org.etsi.ttcn.tci.Value;
 import org.etsi.ttcn.tri.TriMessage;
@@ -17,13 +17,13 @@ public class LibItsContainer_asn1 extends LibIts_asn1 {
      * Constructor
      */
     public LibItsContainer_asn1() {
-        _logger.entering("LibItsContainer_asn1", "LibItsContainer_asn1");
+        //_logger.entering("LibItsContainer_asn1", "LibItsContainer_asn1");
         _encodingName = "ITS_Container";
     }
     
     @Override 
     public Value decode(final TriMessage message, final Type decodingHypothesis) {
-        _logger.entering("LibItsContainer_asn1", "decode", decodingHypothesis.getName());
+        //_logger.entering("LibItsContainer_asn1", "decode", decodingHypothesis.getName());
         
         Value value = null;
         if (decodingHypothesis.getName().equals("TimestampIts")) {
@@ -40,7 +40,7 @@ public class LibItsContainer_asn1 extends LibIts_asn1 {
             value = super.decode(message, decodingHypothesis);
         }
         
-        _logger.exiting("LibIts_asn1", "decode", value.toString());
+        //_logger.exiting("LibIts_asn1", "decode", value.toString());
         return value;
     }
     
diff --git a/javasrc/tool/org/etsi/its/tool/elvior/LibIts_asn1.java b/javasrc/tool/org/etsi/its/tool/elvior/LibIts_asn1.java
index 1f34101344c0e438ceebbdafe1bd8ebeb4392a5a..937489688826858581c3b99ddfb9c65b6166dafc 100644
--- a/javasrc/tool/org/etsi/its/tool/elvior/LibIts_asn1.java
+++ b/javasrc/tool/org/etsi/its/tool/elvior/LibIts_asn1.java
@@ -7,7 +7,7 @@ import org.elvior.ttcn.tritci.IntegerValueEx;
 import org.elvior.ttcn.tritci.TciProvider;
 import org.elvior.ttcn.tritci.TriMessageEx;
 import org.elvior.ttcn.tritci.TriProvider;
-import org.etsi.ttcn.common.ByteHelper;
+import org.etsi.common.ByteHelper;
 import org.etsi.ttcn.tci.RecordValue;
 import org.etsi.ttcn.tci.TciCDProvided;
 import org.etsi.ttcn.tci.TciTypeClass;
@@ -33,7 +33,7 @@ public class LibIts_asn1 implements TciCDProvided {
      * Constructor
      */
     public LibIts_asn1() {
-        _logger.entering("LibIts_asn1", "LibIts_asn1");
+        //_logger.entering("LibIts_asn1", "LibIts_asn1");
         _encodingName = "";
     }
     
@@ -53,11 +53,11 @@ public class LibIts_asn1 implements TciCDProvided {
      */
     @Override
     public Value decode(final TriMessage message, final Type decodingHypothesis) {
-        _logger.entering("LibIts_asn1", "decode", decodingHypothesis.getName());
+        //_logger.entering("LibIts_asn1", "decode", decodingHypothesis.getName());
         
         TriMessageEx msg = TriProvider.getInstance().getTriFactory().createMessageEx();
         msg.setEncodedMessage(message.getEncodedMessage());
-        if (_logger.isLoggable(Level.ALL)) ByteHelper.dump("LibIts_asn1.decode: ", msg.getEncodedMessage());
+        //if (_logger.isLoggable(Level.ALL)) ByteHelper.dump("LibIts_asn1.decode: ", msg.getEncodedMessage());
         
         String type = "";
         if (decodingHypothesis.getTypeEncoding().equals("per-basic-unaligned:1997")) {
@@ -102,24 +102,24 @@ public class LibIts_asn1 implements TciCDProvided {
         } else {
             type = String.format("%s.%s", _encodingName, decodingHypothesis.getName());
         }
-        _logger.info("Type: " + type);
+        //_logger.info("Type: " + type);
         if (type.isEmpty()) {
             return null; // Abort decoding
         }
         Type asnOriginalType = getTypeForName(type);
         // Check which type class the decoding hypothesis is of
-        _logger.info("asnOriginalType: " + asnOriginalType.getName());
+        //_logger.info("asnOriginalType: " + asnOriginalType.getName());
         Value value = TciProvider.getInstance().getSystemInterface().internalDecode(msg, asnOriginalType);
-        _logger.exiting("LibIts_asn1", "decode", value.toString());
+        //_logger.exiting("LibIts_asn1", "decode", value.toString());
         return value;
     }
     
     @Override
     public TriMessage encode(final Value template) {
-        _logger.entering("LibIts_asn1", "encode", template.getType().getName());
+        //_logger.entering("LibIts_asn1", "encode", template.getType().getName());
         
         String type = String.format("%s.%s", _encodingName, template.getType().getName());
-        _logger.info("Type: " + type);
+        //_logger.info("Type: " + type);
         Type asnOriginalType = getTypeForName(type);
         if (asnOriginalType != null) {
             Value internalASNEncodecValue = null;
@@ -129,13 +129,13 @@ public class LibIts_asn1 implements TciCDProvided {
                     String[] fields = ((RecordValue)internalASNEncodecValue).getFieldNames();
                     RecordValue asn1Value = (RecordValue)template;
                     for(String field: fields) {
-                        _logger.info(String.format("Process field %s", field));
+                        //_logger.info(String.format("Process field %s", field));
                         Value fieldValue = asn1Value.getField(field);
                         if(fieldValue.notPresent()) { 
-                            _logger.info(String.format("Field %s was omitted", field));
+                            //_logger.info(String.format("Field %s was omitted", field));
                                     ((RecordValue)internalASNEncodecValue).setFieldOmitted(field);
                         } else { 
-                            _logger.info(String.format("Field %s was added", field));
+                            //_logger.info(String.format("Field %s was added", field));
                                     ((RecordValue)internalASNEncodecValue).setField(field, fieldValue);
                         }
                     } // End of 'for' statement
@@ -147,23 +147,23 @@ public class LibIts_asn1 implements TciCDProvided {
                 default:
                     throw new RuntimeException("Unimplemented type " + template.getType().getTypeClass());
             } // End of 'switch' statement
-            _logger.info("Call internal codec");
+            //_logger.info("Call internal codec");
             TriMessage msg = TciProvider.getInstance().getSystemInterface().internalEncode(internalASNEncodecValue);
-            ByteHelper.dump("LibIts_asn1.encode: ", msg.getEncodedMessage());
-            _logger.exiting("LibIts_asn1", "encode");
+            //ByteHelper.dump("LibIts_asn1.encode: ", msg.getEncodedMessage());
+            //_logger.exiting("LibIts_asn1", "encode");
             return msg;
         }
         
-        _logger.exiting("LibIts_asn1", "encode", "null");
+        //_logger.exiting("LibIts_asn1", "encode", "null");
         return null;
     }
     
     protected Type getTypeForName(final String type) { 
-        _logger.entering("LibIts_asn1", "getTypeForName", type);
+        //_logger.entering("LibIts_asn1", "getTypeForName", type);
         
         Type asnOriginalType = TciProvider.getInstance().getTciCDRequired().getTypeForName(type);
         
-        _logger.exiting("LibIts_asn1", "getTypeForName", asnOriginalType.getName());
+        //_logger.exiting("LibIts_asn1", "getTypeForName", (asnOriginalType != null) ? asnOriginalType.getName() : "(null)");
         return asnOriginalType;
     } // End of method getTypeForName
     
diff --git a/javasrc/tool/org/etsi/its/tool/elvior/PluginAdapter.java b/javasrc/tool/org/etsi/its/tool/elvior/PluginAdapter.java
index 55a4f33c650dfed042802398260004b61f069022..182b1bdaf6c7dd57ab2e1ce0199a05b1ef19c1ab 100644
--- a/javasrc/tool/org/etsi/its/tool/elvior/PluginAdapter.java
+++ b/javasrc/tool/org/etsi/its/tool/elvior/PluginAdapter.java
@@ -561,14 +561,14 @@ public class PluginAdapter implements TriCommunicationSA, TriCommunicationTE, xT
         longitudeB.setInteger(ByteHelper.byteArrayToInt(value));
         
         // Execute the function
-        _logger.info(String.format("_extfuncsImpl.fx_computeDistance %d, %d, %d, %d", latitudeA.getInteger(), longitudeA.getInteger(), latitudeB.getInteger(), longitudeB.getInteger()));
+//        _logger.info(String.format("_extfuncsImpl.fx_computeDistance %d, %d, %d, %d", latitudeA.getInteger(), longitudeA.getInteger(), latitudeB.getInteger(), longitudeB.getInteger()));
         FloatValue distance = _extfuncsImpl.fx_computeDistance(
             latitudeA, 
             longitudeA, 
             latitudeB, 
             longitudeB 
         );
-        _logger.info(String.format("fx_computeDistance returns %f", distance.getFloat())); 
+//        _logger.info(String.format("fx_computeDistance returns %f", distance.getFloat())); 
         returnValue.setParameterPassingMode(TriParameterPassingMode.TRI_OUT);
         byte[] convert = ByteHelper.floatToByteArray(distance.getFloat());
         returnValue.setNumberOfBits(convert.length * Byte.SIZE);