diff --git a/javasrc/codec/org/etsi/ttcn/codec/CodecFactory.java b/javasrc/codec/org/etsi/ttcn/codec/CodecFactory.java
index 11af27c2ef89334534c20bc16c06d85940e8ee94..637cb20900172a97d6585cd55ea2988c5df0d89e 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/CodecFactory.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/CodecFactory.java
@@ -59,9 +59,14 @@ public class CodecFactory {
             // initialize additional codec plugins
             org.etsi.ttcn.codec.its.adapter.Plugin.init();
             org.etsi.ttcn.codec.its.uppertester.Plugin.init();
+            org.etsi.ttcn.codec.its.configtester.Plugin.init();
             org.etsi.ttcn.codec.its.geonetworking.Plugin.init();
             org.etsi.ttcn.codec.its.btp.Plugin.init();
                                  
+            org.etsi.ttcn.codec.its.fntp.Plugin.init();
+            org.etsi.ttcn.codec.its.fsap.Plugin.init();
+            org.etsi.ttcn.codec.its.iicp.Plugin.init();
+            org.etsi.ttcn.codec.its.atsp.Plugin.init();
         }        
     }
 
diff --git a/javasrc/codec/org/etsi/ttcn/codec/MainCodec.java b/javasrc/codec/org/etsi/ttcn/codec/MainCodec.java
index 1691a8fe67040bc4bb0c83d73bf6a975bdbef71d..1437b7d4caac35f608210a73947c1db411a5a477 100644
--- a/javasrc/codec/org/etsi/ttcn/codec/MainCodec.java
+++ b/javasrc/codec/org/etsi/ttcn/codec/MainCodec.java
@@ -8,15 +8,15 @@ package org.etsi.ttcn.codec;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.etsi.ttcn.tri.TriMessage;
+import org.etsi.codec.ITciCDWrapper;
 import org.etsi.ttcn.tci.TciCDProvided;
-import org.etsi.ttcn.tci.TciCDRequired;
 import org.etsi.ttcn.tci.Type;
 import org.etsi.ttcn.tci.Value;
+import org.etsi.ttcn.tri.TriMessage;
 
 public class MainCodec extends ICodec {
 
-    public MainCodec(TciCDRequired cdReq) {
+    public MainCodec(ITciCDWrapper cdReq) {
         super(null);
         this.cdReq = cdReq;
     }
@@ -97,11 +97,11 @@ public class MainCodec extends ICodec {
         presenceHints.put(key, value);
     }
 
-    public TciCDRequired getTciCDRequired() {
+    public ITciCDWrapper getTciCDRequired() {
         return cdReq;
     }
 
     protected Map<String, String> hints = new TreeMap<String, String>();
     protected Map<String, java.lang.Boolean> presenceHints = new TreeMap<String, java.lang.Boolean>();
-    protected TciCDRequired cdReq;
+    protected ITciCDWrapper cdReq;
 }