diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 8c0f494..2ef8773 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -20,7 +20,6 @@
 import from MobileL3_CC_Types all;
 import from MobileL3_GMM_SM_Types all;
 import from MobileL3_SMS_Types all;
-import from RLCMAC_CSN1_Templates all;
 
 /* TS 24.007 Table 11.3 TI Flag */
 const BIT1 c_TIF_ORIG := '0'B;
@@ -2095,6 +2094,58 @@
 	cnSpecificDRXCycleLength := '0000'B /* SI value used */
 };
 
+private function f_presence_bit_MultislotCap_GPRS(template (omit) MultislotCap_GPRS mscap_gprs) return BIT1 {
+	if (istemplatekind(mscap_gprs, "omit")) {
+		return '0'B;
+	}
+	return '1'B;
+}
+private function f_presence_bit_MultislotCap_EGPRS(template (omit) MultislotCap_EGPRS mscap_egprs) return BIT1 {
+	if (istemplatekind(mscap_egprs, "omit")) {
+		return '0'B;
+	}
+	return '1'B;
+}
+template (value) MSRACapabilityValuesRecord ts_RaCapRec(BIT4 att := '0001'B /* E-GSM */, template (omit) MultislotCap_GPRS mscap_gprs := omit, template (omit) MultislotCap_EGPRS mscap_egprs := omit) := {
+	mSRACapabilityValues := {
+		mSRACapabilityValuesExclude1111 := {
+			accessTechnType := att, /* E-GSM */
+			accessCapabilities := {
+				lengthIndicator := 0, /* overwritten */
+				accessCapabilities := {
+					rfPowerCapability := '001'B, /* FIXME */
+					presenceBitA5 := '0'B,
+					a5bits := omit,
+					esind := '1'B,
+					psbit := '0'B,
+					vgcs := '0'B,
+					vbs := '0'B,
+					presenceBitMultislot := '1'B,
+					multislotcap := {
+						presenceBitHscsd := '0'B,
+						hscsdmultislotclass := omit,
+						presenceBitGprs := f_presence_bit_MultislotCap_GPRS(mscap_gprs),
+						gprsmultislot := mscap_gprs,
+						presenceBitSms := '0'B,
+						multislotCap_SMS := omit,
+						multislotCapAdditionsAfterRel97 := {
+								presenceBitEcsdmulti := '0'B,
+								ecsdmultislotclass := omit,
+								presenceBitEgprsmulti := f_presence_bit_MultislotCap_EGPRS(mscap_egprs),
+								multislotCap_EGPRS := mscap_egprs,
+								presenceBitDtmGprsmulti := '0'B,
+								multislotCapdtmgprsmultislotsubclass := omit
+						}
+					},
+					accessCapAdditionsAfterRel97 := omit
+				},
+				spare_bits := omit
+			}
+		}
+	},
+	presenceBitMSRACap := '0'B
+};
+
 template (value) MSRadioAccessCapabilityLV ts_MS_RaCapa := {
 	lengthIndicator := 0, /* overwritten */
 	msRadioAccessCapabilityV := {