diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn
index 46159b7..884a7c0 100644
--- a/library/MNCC_Types.ttcn
+++ b/library/MNCC_Types.ttcn
@@ -499,9 +499,9 @@
 	}
 };
 
-/* MT: MSC -> MNCC: Respons to SETUP.req */
-template MNCC_PDU tr_MNCC_SETUP_rsp(template uint32_t call_id := ?, template MNCC_number connected := *,
-				    template charstring imsi := ?) := {
+/* MO: MSC <- MNCC: Respons to SETUP.ind */
+template MNCC_PDU ts_MNCC_SETUP_rsp(uint32_t call_id, charstring imsi := "",
+				    template MNCC_number connected := omit) := {
 	msg_type := MNCC_SETUP_RSP,
 	u := {
 		signal := {	/* See 24.008 9.3.5 */
@@ -513,20 +513,20 @@
 			connected := connected,
 			cause := omit,
 			progress := omit,
-			useruser := *,
-			facility := *,
+			useruser := omit,				/* optional */
+			facility := omit,				/* optional */
 			cccap := omit,
-			ssversion := *,
+			ssversion := omit,				/* optional */
 			clir_sup := 0,
 			clir_inv := 0,
 			signal := omit,
 			keypad := omit,
 			more := 0,
 			notify := 0,
-			emergency := *,
+			emergency := omit,
 			imsi := imsi,
-			lchan_type := ?,
-			lchan_mode := ?
+			lchan_type := 0,
+			lchan_mode := 0
 		}
 	}
 };
@@ -595,9 +595,9 @@
 	}
 }
 
-/* MO: MSC <- MNCC: SETUP_COMPL.req; request to send CONNECT ACK */
-template MNCC_PDU ts_MNCC_SETUP_COMPL_req(uint32_t call_id) :=
-		ts_MNCC_SIMPLE(MNCC_SETUP_COMPL_REQ, call_id); /* See 24.008 9.3.6 */
+/* MT: MSC -> MNCC: SETUP_COMPL.req; request to send CONNECT ACK */
+template MNCC_PDU tr_MNCC_SETUP_COMPL_req(template uint32_t call_id) :=
+		tr_MNCC_SIMPLE(MNCC_SETUP_COMPL_REQ, call_id); /* See 24.008 9.3.6 */
 
 /* MT: MSC -> MNCC: SETUP_COMPL.ind; receipt of CONNECT ACK */
 template MNCC_PDU tr_MNCC_SETUP_COMPL_ind(template uint32_t call_id := ?) :=