diff --git a/ttcn/LibIms_Templates.ttcn b/ttcn/LibIms_Templates.ttcn
index 932d01bf81cd3d642f52509fed3c29ddf96e8ba9..d5f27e5a11edab1378436ab61f87f4c9c6069af2 100644
--- a/ttcn/LibIms_Templates.ttcn
+++ b/ttcn/LibIms_Templates.ttcn
@@ -529,22 +529,22 @@ group XMLTemplates {
     template XmlBody
 	m_XmlBody_ACR_ICB(template (value) Incoming_communication_barring p_icb) := {
 		simservs := {
-			anyAttributes := omit,
-			choice := {{incoming_communication_barring := p_icb}},
-            extensions := omit  
+			omit,
+			{{incoming_communication_barring := p_icb}},
+            omit  
 		}
 	}
-	
+	   
     template XmlBody m_XmlBody_ACR_OCB(template (value) Outgoing_communication_barring p_ocb) :=
     {
         simservs := {
-            anyAttributes := omit,
-            choice := {
+            omit,
+            {
                 {
                     outgoing_communication_barring := p_ocb
                 }   
             },
-            extensions := omit  
+            omit  
         }
     };
 	
@@ -553,11 +553,6 @@ group XMLTemplates {
 		cdivn := p_cdivn
 	};
 	
-//	template XmlBody m_XmlBody_CDIVN(template Comm_div_info p_cdivn) :=
-//	{
-//		cdivn := p_cdivn
-//	};
-
     template XmlBody m_XmlBody_Reginfo(template Reginfo p_regInfo) :=
     {
         regInfo := p_regInfo
@@ -655,8 +650,8 @@ group ACR_CBTemplates {
 	}
 
 	template ConditionsType m_conditionsType_identity(template charstring p_id, template charstring p_scheme) := {
-        content := {
-            {identity := {content := {{one := {id := p_id, elem := omit}}}}} 
+        {
+            {identity := {{{one := {id := p_id, elem := omit}}}}} 
         }
 	}
 	
@@ -703,8 +698,8 @@ group CUGTemplates {
 
 	template CugRequestType mw_cugReqType(template boolean p_outAccessRequest, template integer p_cugIndex) :=
 	{
-		outgoingAccessRequest := {bool:=p_outAccessRequest},
-		cugIndex := p_cugIndex
+        outgoingAccessRequest := {bool:=p_outAccessRequest},
+        cugIndex := p_cugIndex
 	}
 }//end group CUGTemplates
 
@@ -1226,7 +1221,7 @@ group CONFTemplates {
 			elem_list:=omit
 	}
 	
-	template Conference_state_type m_conference_state(template unsignedInt p_nUsers, template booleanXSD p_active, template booleanXSD p_locked) := {
+	template Conference_state_type m_conference_state(template unsignedInt p_nUsers, template XSDAUX.booleanXSD p_active, template XSDAUX.booleanXSD p_locked) := {
     	anyAttributes:=omit,//m_emptyAnyAttributes,
     	user_count:=p_nUsers,
     	active:=p_active,
@@ -3035,7 +3030,7 @@ group response_send
 	}
 
 	template Response m_Response_2xxonINVITE_PchargingVector (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,
-		  From p_from, To p_to, Via p_via, template Route p_route, template RecordRoute p_recordroute, MessageBody p_mb, template Contact p_contact, template PChargingVector p_pChargingVector ) modifies m_Response_mbody :=
+		  From p_from, To p_to, Via p_via, template Route p_route, template RecordRoute p_recordroute, template MessageBody p_mb, template Contact p_contact, template PChargingVector p_pChargingVector ) modifies m_Response_mbody :=
 	{
 		msgHeader :=
 		{