diff --git a/ttcn/DENM/LibItsDenm_Functions.ttcn b/ttcn/DENM/LibItsDenm_Functions.ttcn
index 702efd3ed3a685bb231b27a9ee31975ce17bf18a..a7b490379fbf8db02586643d304dbb6c924690bf 100644
--- a/ttcn/DENM/LibItsDenm_Functions.ttcn
+++ b/ttcn/DENM/LibItsDenm_Functions.ttcn
@@ -130,7 +130,9 @@ module LibItsDenm_Functions {
             if (p_trigger == e_ets) {
                 f_sendDenMessage(
                     m_denmReq(
-                        m_denmWithCause(c_dataVersionCancellation, p_event, f_getCurrentPosition(), f_getStationId())
+                    	m_denmPdu(
+                        	m_denmWithCause(c_dataVersionCancellation, p_event, f_getCurrentPosition(), f_getStationId())
+                        )
                     )
                 );
             }
@@ -306,7 +308,7 @@ module LibItsDenm_Functions {
          * @return 
          */
         function f_sendDenMessage(template (value) DenmReq p_sendMsg) runs on ItsFa {
-            p_sendMsg.msgOut.management.actionID.sequenceNo := vc_sequenceNo;
+            p_sendMsg.msgOut.denm.management.actionID.sequenceNo := vc_sequenceNo;
             
             denmPort.send(p_sendMsg);
         }
diff --git a/ttcn/DENM/LibItsDenm_Templates.ttcn b/ttcn/DENM/LibItsDenm_Templates.ttcn
index d755a877dd25592a055eb452c0ee2df578987c07..f8cbf61d410f60372d12177f0d06fa0e1f545a30 100644
--- a/ttcn/DENM/LibItsDenm_Templates.ttcn
+++ b/ttcn/DENM/LibItsDenm_Templates.ttcn
@@ -16,19 +16,43 @@ module LibItsDenm_Templates {
     group primitivesTemplates {
         
         template DenmReq m_denmReq(
-            template (value) DecentralizedEnvironmentalNotificationMessage p_denMsg
+            template (value) DenmPdu p_denMsg
             ) := {
             msgOut := p_denMsg
         }
         
         template DenmInd mw_denmInd(
-            template (present) DecentralizedEnvironmentalNotificationMessage p_denMsg
+            template (present) DenmPdu p_denMsg
             ) := {
             msgIn := p_denMsg
         }
         
     } // end primitives
     
+    group denmPduTemplates {
+        
+        template ItsPduHeader m_itsPduHeader := {
+            protocolVersion := c_protocolVersion_DENM,
+			messageID := c_messageId,
+            generationTime := 0 //TODO document: 0 indicates that the lower layer should add the time while sending
+        }
+        
+        template ItsPduHeader mw_itsPduHeader modifies m_itsPduHeader := {
+            generationTime := ?
+        }
+                
+        template DenmPdu m_denmPdu(in template (value) DecentralizedEnvironmentalNotificationMessage p_denm) := {
+        	header := m_itsPduHeader,
+        	denm := p_denm            
+        }
+             
+        template DenmPdu mw_denmPdu(in template (present) DecentralizedEnvironmentalNotificationMessage p_denm) := {
+        	header := mw_itsPduHeader,
+        	denm := p_denm            
+        }     
+                
+    } // end denmPduTemplates
+        
     group DecentralizedEnvironmentalNotificationMessageTemplates {
         
         template DecentralizedEnvironmentalNotificationMessage m_denm(
@@ -36,9 +60,6 @@ module LibItsDenm_Templates {
             template (value) DecentralizedSituation p_sit,
             template (value) DecentralizedSituationLocation p_loc
             ) := {
-            protocolVersion := c_protocolVersion_DENM,
-			messageID := c_messageId,
-            generationTime := 0, //TODO document: 0 indicates that the lower layer should add the time while sending
             management := p_mgmt, 
             situation := p_sit, 
             location := p_loc
@@ -49,9 +70,6 @@ module LibItsDenm_Templates {
             template (present) DecentralizedSituation p_sit,
             template (present) DecentralizedSituationLocation p_loc
             ) := {
-            protocolVersion := c_protocolVersion_DENM,   
-            messageID := c_messageId,
-            generationTime := ?,
             management := p_mgmt, 
             situation := p_sit, 
             location := p_loc
@@ -63,9 +81,6 @@ module LibItsDenm_Templates {
             template (value) DecentralizedSituationLocation.eventPosition p_eventPosition,            
             template (value) StationID p_stationId
             ) := {
-            protocolVersion := c_protocolVersion_DENM, 
-            messageID := c_messageId,               
-            generationTime := 0, //TODO document: 0 indicates that the lower layer should add the time while sending
             management := m_denmMgmtCon(p_dataVersion, p_stationId), 
             situation := m_denmSitCon(p_sit, informative),
             location := m_denmSitLoc(
diff --git a/ttcn/DENM/LibItsDenm_TypesAndValues.ttcn b/ttcn/DENM/LibItsDenm_TypesAndValues.ttcn
index e95c9b38b4c903bcd30385d42678557fa444dd78..2188da27cd572eb2b6524a2fe32a0f538090a100 100644
--- a/ttcn/DENM/LibItsDenm_TypesAndValues.ttcn
+++ b/ttcn/DENM/LibItsDenm_TypesAndValues.ttcn
@@ -22,10 +22,10 @@ module LibItsDenm_TypesAndValues {
     
     group denmConstants {
         
-        const DecentralizedEnvironmentalNotificationMessage.protocolVersion c_protocolVersion_DENM := 0;
+        const ItsPduHeader.protocolVersion c_protocolVersion_DENM := 0;
         
         //TODO check which value or value handling should be applied
-        const DecentralizedEnvironmentalNotificationMessage.messageID c_messageId := 0;
+        const ItsPduHeader.messageID c_messageId := 0;
         
         const DataVersion c_dataVersionCancellation := 255;
         
diff --git a/ttcn/LibIts_Interface.ttcn b/ttcn/LibIts_Interface.ttcn
index fa3898040ab9826821cf10fe7e27e848df3737be..c853a2a76411e1e464530ced873a52b7ef409bd1 100644
--- a/ttcn/LibIts_Interface.ttcn
+++ b/ttcn/LibIts_Interface.ttcn
@@ -314,7 +314,7 @@ module LibIts_Interface {
                  * @member denmMsg
 				 */
 				type record DenmInd {
-				    DecentralizedEnvironmentalNotificationMessage msgIn
+				    DenmPdu msgIn
 				}
 				
 				/**
@@ -323,7 +323,7 @@ module LibIts_Interface {
 				 * @member denmMsg
 				 */
 				type record DenmReq {
-				    DecentralizedEnvironmentalNotificationMessage msgOut
+				    DenmPdu msgOut
 				}
 						    
 			} // end fa1Primitives