diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index 6e7813f..0d2db3d 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -256,7 +256,17 @@
 	cicLow := bit2oct((substr(int2bit(span, 11), 8, 3) << 5) & int2bit(ts, 5))
 }
 
-template (value) PDU_BSSAP ts_BSSMAP_AssignmentReq(uint11_t span, uint5_t ts)
+template (value) BSSMAP_IE_AoIP_TransportLayerAddress ts_BSSMAP_IE_AoIP_TLA(BSSMAP_FIELD_IPAddress addr,
+									    uint16_t udp_port) := {
+	elementIdentifier := '7C'O,
+	lengthIndicator := 0, /* overwritten */
+	ipAddress := addr,
+	uDPPortValue := udp_port
+}
+
+template PDU_BSSAP
+ts_BSSMAP_AssignmentReq(template BSSMAP_IE_CircuitIdentityCode cic := omit,
+			template BSSMAP_IE_AoIP_TransportLayerAddress aoip := omit)
 modifies ts_BSSAP_BSSMAP := {
 	pdu := {
 		bssmap := {
@@ -265,7 +275,7 @@
 				channelType := ts_BSSMAP_IE_ChannelType,
 				layer3HeaderInfo := omit,
 				priority := omit,
-				circuitIdentityCode := ts_BSSMAP_IE_CIC(span, ts),
+				circuitIdentityCode := cic,
 				downLinkDTX_Flag := omit,
 				interferenceBandToBeUsed := omit,
 				classmarkInformationType2 := omit,
@@ -276,7 +286,7 @@
 				serviceHandover := omit,
 				encryptionInformation := omit,
 				talkerPriority := omit,
-				aoIPTransportLayer := omit,
+				aoIPTransportLayer := aoip,
 				codecList := omit,
 				callIdentifier := omit,
 				kC128 := omit,
@@ -321,7 +331,9 @@
 	}
 }
 
-template (value) PDU_BSSAP ts_BSSMAP_AssignmentComplete(BSSMAP_IE_CircuitIdentityCode cic)
+template PDU_BSSAP
+ts_BSSMAP_AssignmentComplete(template BSSMAP_IE_CircuitIdentityCode cic := omit,
+			     template BSSMAP_IE_AoIP_TransportLayerAddress aoip := omit)
 modifies ts_BSSAP_BSSMAP := {
 	pdu := {
 		bssmap := {
@@ -336,7 +348,7 @@
 				speechVersion := omit,
 				lSAIdentifier := omit,
 				talkerPriority := omit,
-				aoIPTransportLayer := omit,
+				aoIPTransportLayer := aoip,
 				speechCodec := omit,
 				codecList := omit,
 				lCLS_BSS_Status := omit
@@ -345,13 +357,15 @@
 	}
 }
 
-template PDU_BSSAP tr_BSSMAP_AssignmentComplete modifies tr_BSSAP_BSSMAP := {
+template PDU_BSSAP tr_BSSMAP_AssignmentComplete(template BSSMAP_IE_CircuitIdentityCode cic := *,
+						template BSSMAP_IE_AoIP_TransportLayerAddress aoip := *)
+modifies tr_BSSAP_BSSMAP := {
 	pdu := {
 		bssmap := {
 			assignmentComplete := {
 				messageType := '02'O,	/* overwritten */
 				rR_Cause := *,
-				circuitIdentityCode := ?,
+				circuitIdentityCode := cic,
 				cellIdentifier := *,
 				chosenChannel := *,
 				chosenEncryptionAlgorithm := *,
@@ -359,7 +373,7 @@
 				speechVersion := *,
 				lSAIdentifier := *,
 				talkerPriority := *,
-				aoIPTransportLayer := *,
+				aoIPTransportLayer := aoip,
 				speechCodec := *,
 				codecList := *,
 				lCLS_BSS_Status := *