diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index 939a814..848052e 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -683,17 +683,27 @@
 		}
 	}
 
-	/* Template for a LlcBlock (part of a LLC frame inside RlcMac?lDataBlock */
-	template LlcBlock t_RLCMAC_LLCBLOCK(octetstring data, boolean more := false, boolean e := true) := {
-		/* let encoder figure out the header */
-		hdr := omit,
+	template LlcBlockHdr t_RLCMAC_LLCBLOCK_HDR(uint16_t length_ind, boolean more, boolean e) := {
+		length_ind := length_ind,
+		more := more, /* 1 = new LLC PDU starts */
+		e := e /* 0 = another extension octet after LLC PDU, 1 = no more extension octets */
+	}
+
+	template EgprsLlcBlockHdr t_RLCMAC_LLCBLOCK_EGPRS_HDR(uint16_t length_ind, boolean e) := {
+		length_ind := length_ind,
+		e := e /* 0 = another extension octet after LLC PDU, 1 = no more extension octets */
+	}
+
+	/* Template for a LlcBlock (part of a LLC frame inside RlcMacDlDataBlock */
+	template LlcBlock t_RLCMAC_LLCBLOCK(octetstring data, template (omit) LlcBlockHdr llc_hdr := omit) := {
+		hdr := llc_hdr, /* omit = let encoder figure out the header */
 		payload := data
 	}
 
 	/* Template for a LlcBlock (part of a LLC frame inside RlcMacEgprs?lDataBlock */
-	template EgprsLlcBlock t_RLCMAC_LLCBLOCK_EGPRS(octetstring data, boolean e := true) := {
+	template EgprsLlcBlock t_RLCMAC_LLCBLOCK_EGPRS(octetstring data, template (omit) EgprsLlcBlockHdr llc_hdr := omit) := {
 		/* let encoder figure out the header */
-		hdr := omit,
+		hdr := llc_hdr, /* omit = let encoder figure out the header */
 		payload := data
 	}