diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index 5d13899..8156ca8 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -329,13 +329,19 @@
 const OCT1 ChRate_TCHForH := '0F'O;
 const OCT1 ChRate_TCHForH_nochg := '1F'O;
 
+const OCT1 Spdi_TCHF_FR  := '01'O;
+const OCT1 Spdi_TCHF_EFR := '11'O;
+const OCT1 Spdi_TCHF_AMR := '21'O;
+const OCT1 Spdi_TCHH_HR  := '05'O;
+const OCT1 Spdi_TCHH_AMR := '25'O;
+
 template (value) BSSMAP_IE_ChannelType ts_BSSMAP_IE_ChannelType := {
 	elementIdentifier := '0B'O,	/* overwritten */
 	lengthIndicator := 0,		/* overwritten */
 	speechOrDataIndicator := '0001'B,	/* speech */
 	spare1_4 := '0000'B,
 	channelRateAndType := ChRate_TCHF,
-	speechId_DataIndicator := '01'O	/* FRv1 */
+	speechId_DataIndicator := Spdi_TCHF_FR
 }
 
 template (value) BSSMAP_IE_ChannelType ts_BSSMAP_IE_ChannelTypeCTM modifies ts_BSSMAP_IE_ChannelType := {