diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index c6698b1..1dcbef1 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -477,7 +477,15 @@
 	key := kc
 }
 
+template BSSMAP_IE_ChosenEncryptionAlgorithm ts_BSSMAP_IE_ChosenEncryptionAlgorithm(OCT1 algorithmIdentifier) := {
+	elementIdentifier := '2C'O,
+	algorithmIdentifier := algorithmIdentifier
+}
 
+template BSSMAP_IE_ChosenEncryptionAlgorithm tr_BSSMAP_IE_ChosenEncryptionAlgorithm(template OCT1 algorithmIdentifier := ?) := {
+	elementIdentifier := '2C'O,
+	algorithmIdentifier := algorithmIdentifier
+}
 
 template (value) BSSMAP_IE_CircuitIdentityCode ts_BSSMAP_IE_CIC(uint11_t span, uint5_t ts) := {
 	elementIdentifier := '01'O,	/* overwritten */
@@ -956,7 +964,10 @@
 		template BSSMAP_IE_AoIP_TransportLayerAddress aoip_tla := omit,
 		template BSSMAP_IE_CellIdentifier cell_id_target := ts_CellID_LAC_CI(1, 0),
 		template BSSMAP_IE_CellIdentifier cell_id_source := ts_CellID_LAC_CI(1, 1),
-		template (omit) BSSMAP_oldToNewBSSIEs oldToNewBSSIEs := omit
+		template (omit) BSSMAP_oldToNewBSSIEs oldToNewBSSIEs := omit,
+		template BSSMAP_IE_EncryptionInformation encryptionInformation := ts_BSSMAP_IE_EncrInfo('0000000000000000'O,'01'O),
+		template (omit) BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm := omit,
+		template (omit) BSSMAP_IE_KC128 kC128 := omit
 		)
 modifies ts_BSSAP_BSSMAP := {
 	pdu := {
@@ -964,8 +975,7 @@
 			handoverRequest := {
 				messageType := '10'O,
 				channelType := ts_BSSMAP_IE_ChannelType,
-				encryptionInformation :=
-					ts_BSSMAP_IE_EncrInfo('0000000000000000'O,'01'O),
+				encryptionInformation := encryptionInformation,
 				classmarkInformationType := {
 					classmarkInformationType1 := {
 						elementIdentifier := '1D'O,
@@ -989,7 +999,7 @@
 				groupCallReference := omit,
 				talkerFlag := omit,
 				configurationEvolutionIndication := omit,
-				chosenEncryptionAlgorithm := omit,
+				chosenEncryptionAlgorithm := chosenEncryptionAlgorithm,
 				oldToNewBSSInfo := f_ts_BSSMAP_IE_OldToNewBSSInfo(oldToNewBSSIEs),
 				lSAInformation := omit,
 				lSAAccessControlSuppression := omit,
@@ -1002,7 +1012,7 @@
 				aoIPTransportLayer := aoip_tla,
 				codecList := omit,
 				callIdentifier := omit,
-				kC128 := omit,
+				kC128 := kC128,
 				globalCallReference := omit,
 				lCLS_Configuration := omit,
 				connectionStatusControl := omit