diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index 406dfc5..776e8be 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -1599,6 +1599,31 @@
 	}
 }
 
+template PDU_BSSAP ts_BSSMAP_CommonId(hexstring imsi_digits)
+modifies ts_BSSAP_BSSMAP := {
+	pdu := {
+		bssmap := {
+			commonID := {
+				messageType := '2F'O,
+				iMSI := ts_BSSMAP_Imsi(imsi_digits),
+				sNAAccessInformation := omit
+			}
+		}
+	}
+}
+
+template PDU_BSSAP tr_BSSMAP_CommonId(template hexstring imsi_digits)
+modifies tr_BSSAP_BSSMAP := {
+	pdu := {
+		bssmap := {
+			commonID := {
+				messageType := '2F'O,
+				iMSI := tr_BSSMAP_Imsi(imsi_digits),
+				sNAAccessInformation := *
+			}
+		}
+	}
+}