diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index cf0dfef..075dab7 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -471,7 +471,9 @@
 	}
 }
 
-template PDU_BSSAP tr_BSSMAP_AssignmentReq modifies tr_BSSAP_BSSMAP := {
+template PDU_BSSAP tr_BSSMAP_AssignmentReq(template BSSMAP_IE_CircuitIdentityCode cic := *,
+					   template BSSMAP_IE_AoIP_TransportLayerAddress aoip := *)
+modifies tr_BSSAP_BSSMAP := {
 	pdu := {
 		bssmap := {
 			assignmentRequest := {
@@ -479,7 +481,7 @@
 				channelType := ?,
 				layer3HeaderInfo := *,
 				priority := *,
-				circuitIdentityCode := *,
+				circuitIdentityCode := cic,
 				downLinkDTX_Flag := *,
 				interferenceBandToBeUsed := *,
 				classmarkInformationType2 := *,
@@ -490,7 +492,7 @@
 				serviceHandover := *,
 				encryptionInformation := *,
 				talkerPriority := *,
-				aoIPTransportLayer := *,
+				aoIPTransportLayer := aoip,
 				codecList := *,
 				callIdentifier := *,
 				kC128 := *,