diff --git a/library/BSSAP_CodecPort.ttcn b/library/BSSAP_CodecPort.ttcn
new file mode 120000
index 0000000..afec2d4
--- /dev/null
+++ b/library/BSSAP_CodecPort.ttcn
@@ -0,0 +1 @@
+../msc_tests/BSSAP_CodecPort.ttcn
\ No newline at end of file
diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index 12aabc6..29d06c7 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -156,6 +156,13 @@
 	layer3info := l3info
 }
 
+template BSSMAP_IE_Layer3Information tr_BSSMAP_IE_L3Info(template octetstring l3info) := {
+	elementIdentifier := '17'O,
+	lengthIndicator := ?,
+	layer3info := l3info
+}
+
+
 template PDU_BSSAP ts_BSSMAP_ComplL3(BSSMAP_IE_CellIdentifier cell_id, octetstring l3_info)
 modifies ts_BSSAP_BSSMAP := {
 	pdu := {
@@ -176,10 +183,23 @@
 	}
 }
 
-template PDU_BSSAP tr_BSSMAP_ComplL3 modifies tr_BSSAP_BSSMAP := {
+template PDU_BSSAP tr_BSSMAP_ComplL3(template octetstring l3_info := ?,
+				     template BSSMAP_IE_CellIdentifier cell_id := ?)
+modifies tr_BSSAP_BSSMAP := {
 	pdu := {
 		bssmap := {
-			completeLayer3Information := ?
+			completeLayer3Information := {
+				messageType := '57'O,
+				cellIdentifier := cell_id,
+				layer3Information := tr_BSSMAP_IE_L3Info(l3_info),
+				chosenChannel := *,
+				lSAIdentifier := *,
+				aPDU := *,
+				codecList := *,
+				redirectAttemptFlag := *,
+				sendSequenceNumber := *,
+				iMSI := *
+			}
 		}
 	}
 }