diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index f8cb395..0810bd3 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -2301,7 +2301,8 @@
 				 template (value) GroupCallRef group_call_ref,
 				 template (omit) BSSMAP_IE_CircuitIdentityCode cic := omit,
 				 template (omit) BSSMAP_IE_AoIP_TransportLayerAddress aoip := omit,
-				 template (omit) OCT4 call_id := omit)
+				 template (omit) OCT4 call_id := omit,
+				 template (omit) BSSMAP_IE_SpeechCodecList codecList := omit)
 modifies ts_BSSAP_BSSMAP := {
 	pdu := {
 		bssmap := {
@@ -2320,7 +2321,7 @@
 				cellIdentifierListSegment := omit,
 				aoIPTransportLayer := aoip,
 				callIdentifier := ts_BSSMAP_IE_CallIdentifier(call_id),
-				codecList := omit
+				codecList := codecList
 			}
 		}
 	}
@@ -2331,8 +2332,9 @@
 				 template (present) BSSMAP_IE_CellIdentifier cell_id,
 				 template (present) GroupCallRef group_call_ref,
 				 template BSSMAP_IE_CircuitIdentityCode cic := *,
-				 template BSSMAP_IE_AoIP_TransportLayerAddress aoip := ?,
-				 template OCT4 call_id := ?)
+				 template BSSMAP_IE_AoIP_TransportLayerAddress aoip := *,
+				 template OCT4 call_id := *,
+				 template BSSMAP_IE_SpeechCodecList codecList := *)
 modifies tr_BSSAP_BSSMAP := {
 	pdu := {
 		bssmap := {
@@ -2351,7 +2353,7 @@
 				cellIdentifierListSegment := omit,
 				aoIPTransportLayer := aoip,
 				callIdentifier := tr_BSSMAP_IE_CallIdentifier(call_id),
-				codecList := omit
+				codecList := codecList
 			}
 		}
 	}
@@ -2388,9 +2390,9 @@
 				 template (present) BSSMAP_IE_CellIdentifier cell_id,
 				 template BSSMAP_IE_ChosenChannel chosen_ch := *,
 				 template BSSMAP_IE_CircuitIdentityCode cic := omit,
-				 template BSSMAP_IE_AoIP_TransportLayerAddress aoip := ?,
-				 template BSSMAP_IE_SpeechCodec speech_codec := ?,
-				 template OCT4 call_id := ?)
+				 template BSSMAP_IE_AoIP_TransportLayerAddress aoip := *,
+				 template BSSMAP_IE_SpeechCodec speech_codec := *,
+				 template OCT4 call_id := *)
 modifies tr_BSSAP_BSSMAP := {
 	pdu := {
 		bssmap := {