diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 87c9bd9..0da4706 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -300,6 +300,134 @@
 	}
 }
 
+template PDU_ML3_MS_NW ts_ML3_MO_CC(integer tid) := {
+	discriminator := '0011'B,
+	tiOrSkip := {
+		transactionId := {
+			tio := '000'B,
+			tiFlag := '0'B,
+			tIExtension := omit
+		}
+	}
+}
+
+template (value) CalledPartyBCD_Number ts_Called(hexstring digits) := {
+	elementIdentifier := '5E'O,
+	lengthIndicator := 0,			/* overwritten */
+	numberingPlanIdentification := '0000'B,
+	typeOfNumber := '000'B,			/* unknown */
+	ext1 := '0'B,
+	digits := digits
+}
+
+template (value) BearerCapability_TLV ts_Bcap_voice := {
+	elementIdentifier := '04'O,
+	lengthIndicator := 0, /* overwritten */
+	octet3 := {
+		informationTransferCapability := '000'B,
+		transferMode := '0'B,
+		codingStandard := '0'B,
+		radioChannelRequirement := '11'B, /* FR preferred */
+		extension_octet_3 := '0'B,	/* overwritten */
+		speech_aux_3a_3b := omit
+	},
+	octet4 := omit,
+	octet5 := omit,
+	octet6 := omit,
+	octet7 := omit
+}
+
+template PDU_ML3_MS_NW ts_ML3_MO_CC_SETUP(integer tid, hexstring called, template BearerCapability_TLV bcap := ts_Bcap_voice) := {
+	discriminator := '0011'B,
+	tiOrSkip := {
+		transactionId := {
+			tio := int2bit(tid, 3),
+			tiFlag := '0'B,
+			tIExtension := omit
+		}
+	},
+	msgs := {
+		cc := {
+			setup_MS_NW := {
+				messageType := '000101'B,
+				nsd := '00'B,
+				bcRepeatIndicator := omit,
+				bearerCapability1 := bcap,
+				bearerCapability2 := omit,
+				facility := omit,
+				callingPartySubAddress := omit,
+				calledPartyBCD_Number := ts_Called(called),
+				calledPartySubAddress := omit,
+				llc_RepeatIndicator := omit,
+				lowLayerCompatibility1 := omit,
+				lowLayerCompatibility2 := omit,
+				hlc_RepeatIndicator := omit,
+				highLayerCompatibility1 := omit,
+				highLayerCompatibility2 := omit,
+				user_user := omit,
+				ss_VersionIndicator := omit,
+				clir_Suppression := omit,
+				clir_Invocation := omit,
+				cC_Capabilities := omit,
+				facility_ccbs1 := omit,
+				facility_ccbs2 := omit,
+				streamIdentifier := omit,
+				supportedCodecs := omit,
+				redial := omit
+			}
+		}
+	}
+}
+
+template PDU_ML3_NW_MS tr_ML3_MT_CC_CALL_PROC(integer tid) := {
+	discriminator := '0011'B,
+	tiOrSkip := {
+		transactionId := {
+			tio := int2bit(tid, 3),
+			tiFlag := ?,
+			tIExtension := omit
+		}
+	},
+	msgs := {
+		cc := {
+			callProceeding := {
+				messageType := '000010'B,
+				nsd := '00'B,
+				repeatIndicator := *,
+				bearerCapability1 := *,
+				bearerCapability2 := *,
+				facility := *,
+				progressIndicator := *,
+				priorityGranted := *,
+				networkCCCapabilities := *
+			}
+		}
+	}
+}
+
+template PDU_ML3_NW_MS tr_ML3_MT_CC_ALERTING(integer tid) := {
+	discriminator := '0011'B,
+	tiOrSkip := {
+		transactionId := {
+			tio := int2bit(tid, 3),
+			tiFlag := ?,
+			tIExtension := omit
+		}
+	},
+	msgs := {
+		cc := {
+			alerting_NW_MS := {
+				messageType := '000001'B,
+				nsd := '00'B,
+				facility := *,
+				progressIndicator := *,
+				user_user := *
+			}
+		}
+	}
+}
+
+
 
 
 }
diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn
index 1d7980a..e5d6af9 100644
--- a/library/MNCC_Types.ttcn
+++ b/library/MNCC_Types.ttcn
@@ -238,7 +238,7 @@
 
 
 
-template MNCC_number ts_MNCC_number(charstring number,
+template (value) MNCC_number ts_MNCC_number(charstring number,
 				    GSM48_type_of_number ton := GSM48_TON_INTERNATIONAL,
 				    GSM48_num_plan_ind npi := GSM48_NUMPLAN_E164,
 				    GSM48_present_ind pres := GSM48_PRES_IND_ALLOWED,
@@ -250,6 +250,18 @@
 	number := number
 }
 
+template MNCC_number tr_MNCC_number(template charstring number,
+				    template GSM48_type_of_number ton := ?,
+				    template GSM48_num_plan_ind npi := ?,
+				    template GSM48_present_ind pres := ?,
+				    template GSM48_screening_ind screen := ?) := {
+	number_type := ton,
+	plan := npi,
+	presence := pres,
+	screen := screen,
+	number := number
+}
+
 type record MNCC_cause {
 	GSM48_cause_loc		location,
 	GSM48_cause_coding	coding,