diff --git a/LightweightM2M_Stack.tpd b/LightweightM2M_Stack.tpd
new file mode 100644
index 0000000..adbffc7
--- /dev/null
+++ b/LightweightM2M_Stack.tpd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2000-2018 Ericsson Telecom AB
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+    File:               EPTF_Applib_LWM2M_CNL113859.tpd
+    Description:        tpd project file
+    Rev:                R1B
+    Prodnr:             CNL 113 859
+    Updated:            2018-05-31
+    Contact:            http://ttcn.ericsson.se
+-->
+<TITAN_Project_File_Information version="1.0">
+  <ProjectName>LightweightM2M_Stack</ProjectName>
+  <Files>
+    <FileResource projectRelativePath="EPTF_LwM2M_CoapApplibTransport_Definitions.ttcn" relativeURI="src/EPTF_LwM2M_CoapApplibTransport_Definitions.ttcn"/>
+    <FileResource projectRelativePath="EPTF_LwM2M_CoapApplibTransport_Functions.ttcn" relativeURI="src/EPTF_LwM2M_CoapApplibTransport_Functions.ttcn"/>
+    <FileResource projectRelativePath="EPTF_LwM2M_LGen_Definitions.ttcn" relativeURI="src/EPTF_LwM2M_LGen_Definitions.ttcn"/>
+    <FileResource projectRelativePath="EPTF_LwM2M_LGen_Functions.ttcn" relativeURI="src/EPTF_LwM2M_LGen_Functions.ttcn"/>
+    <FileResource projectRelativePath="EPTF_LwM2M_Object_Definitions.ttcn" relativeURI="src/EPTF_LwM2M_Object_Definitions.ttcn"/>
+    <FileResource projectRelativePath="EPTF_LwM2M_Object_Functions.ttcn" relativeURI="src/EPTF_LwM2M_Object_Functions.ttcn"/>
+    <FileResource projectRelativePath="EPTF_LwM2M_Transport_Definitions.ttcn" relativeURI="src/EPTF_LwM2M_Transport_Definitions.ttcn"/>
+  </Files>
+  <ActiveConfiguration>Default</ActiveConfiguration>
+  <Configurations>
+    <Configuration name="Default">
+      <ProjectProperties>
+        <MakefileSettings>
+          <generateInternalMakefile>true</generateInternalMakefile>
+          <GNUMake>true</GNUMake>
+          <incrementalDependencyRefresh>true</incrementalDependencyRefresh>
+          <targetExecutable>bin/LwM2M_Stack</targetExecutable>
+          <buildLevel>Level3-Creatingobjectfileswithdependencyupdate</buildLevel>
+        </MakefileSettings>
+        <LocalBuildSettings>
+          <workingDirectory>bin</workingDirectory>
+        </LocalBuildSettings>
+      </ProjectProperties>
+    </Configuration>
+  </Configurations>
+</TITAN_Project_File_Information>
diff --git a/src/EPTF_LwM2M_LGen_Functions.ttcn b/src/EPTF_LwM2M_LGen_Functions.ttcn
index 859561c..4438c49 100644
--- a/src/EPTF_LwM2M_LGen_Functions.ttcn
+++ b/src/EPTF_LwM2M_LGen_Functions.ttcn
@@ -75,11 +75,7 @@
       refers(f_LwM2M_eCtxUnbind)
       );  
 
-    v_LwM2M_loggingMaskId := 
-      f_EPTF_Logging_registerComponentMasks(
-        "LwM2M_Logging", 
-        {"WARNING", "DEBUG", "3xx", "4xx", "5xx", "6xx", "3xxTo6xx"}, 
-        EPTF_Logging_CLL);
+    f_EPTF_LwM2M_LGen_initLogging();
 
     f_EPTF_LwM2M_Logging_DEBUG(log2str(%definitionId,": my behavior idx is ", v_LwM2M_bIdx));