diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index d92ea61..a3a50de 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -944,6 +944,18 @@
 	}
 }
 
+template PDU_BSSAP ts_BSSMAP_ClassmarkRequest
+modifies ts_BSSAP_BSSMAP := {
+	pdu := {
+		bssmap := {
+			classmarkRequest := {
+				messageType := '58'O,
+				talkerPriority := omit
+			}
+		}
+	}
+}
+
 /* return Layer3 octetstring inside BSSAP PDU */
 function f_bssap_extract_l3(PDU_BSSAP bssap) return template octetstring {
 	if (ischosen(bssap.pdu.bssmap)) {
diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 557b1b8..1ce84cf 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -525,6 +525,21 @@
 	}
 }
 
+template PDU_ML3_NW_MS tr_RRM_CM_ENQUIRY := {
+	discriminator := '0110'B,
+	tiOrSkip := {
+		skipIndicator := '0000'B
+	},
+	msgs := {
+		rrm := {
+			classmarkEnquiry := {
+				messageType := '00010011'B,
+				classmarkEnquiryMask := *
+			}
+		}
+	}
+}
+
 template (value) PDU_ML3_MS_NW ts_RRM_UL_REL(OCT1 cause) := {
 	discriminator := '0110'B,
 	tiOrSkip := {