diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index 1dcbef1..21cf742 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -546,6 +546,11 @@
 	}
 }
 
+template (present) BSSMAP_IE_KC128 tr_BSSMAP_IE_Kc128(template (present) OCT16 kc128) := {
+	elementIdentifier := '83'O,
+	kC128_Value := kc128
+}
+
 template (value) BSSMAP_IE_KC128 ts_BSSMAP_IE_Kc128(OCT16 kc128) := {
 	elementIdentifier := '83'O,
 	kC128_Value := kc128
@@ -1398,21 +1403,25 @@
 	}
 }
 
-template PDU_BSSAP tr_BSSMAP_CipherModeCmd(template OCT1 alg, template OCT8 key)
+template PDU_BSSAP tr_BSSMAP_CipherModeCmd2(template BSSMAP_IE_EncryptionInformation encryptionInformation := *,
+					    template BSSMAP_IE_KC128 kC128 := *)
 modifies tr_BSSAP_BSSMAP := {
 	pdu := {
 		bssmap := {
 			cipherModeCommand := {
 				messageType := '53'O,
 				layer3HeaderInfo := *,
-				encryptionInformation := tr_BSSMAP_IE_EncrInfo(key, alg),
+				encryptionInformation := encryptionInformation,
 				cipherResponseMode := *,
-				kC128 := *
+				kC128 := kC128
 			}
 		}
 	}
 }
 
+template PDU_BSSAP tr_BSSMAP_CipherModeCmd(template OCT1 alg, template OCT8 key, template BSSMAP_IE_KC128 kC128 := omit)
+ := tr_BSSMAP_CipherModeCmd2(tr_BSSMAP_IE_EncrInfo(key, alg), kC128);
+
 template PDU_BSSAP ts_BSSMAP_CipherModeCompl(OCT1 alg)
 modifies ts_BSSAP_BSSMAP := {
 	pdu := {