diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn
index 129f441..2b80fb2 100644
--- a/library/RSL_Types.ttcn
+++ b/library/RSL_Types.ttcn
@@ -49,54 +49,54 @@
 
 		/* Common Channel Management / TRX Management */
 		RSL_MT_BCCH_INFO	('00010001'B),
-		RSL_MT_CCCH_LOAD_IND,
-		RSL_MT_CHAN_RQD,
-		RSL_MT_DELETE_IND,
-		RSL_MT_PAGING_CMD,
-		RSL_MT_IMMEDIATE_ASSIGN_CMD,
-		RSL_MT_SMS_BC_REQ,
-		RSL_MT_CHAN_CONF,		/* non-standard element */
+		RSL_MT_CCCH_LOAD_IND	('00010010'B),
+		RSL_MT_CHAN_RQD		('00010011'B),
+		RSL_MT_DELETE_IND	('00010100'B),
+		RSL_MT_PAGING_CMD	('00010101'B),
+		RSL_MT_IMMEDIATE_ASSIGN_CMD ('00010110'B),
+		RSL_MT_SMS_BC_REQ	('00010111'B),
+		RSL_MT_CHAN_CONF	('00011000'B),	/* non-standard element */
 		/* empty */
 		RSL_MT_RF_RES_IND	('00011001'B),
-		RSL_MT_SACCH_FILL,
-		RSL_MT_OVERLOAD,
-		RSL_MT_ERROR_REPORT,
-		RSL_MT_SMS_BC_CMD,
-		RSL_MT_CBCH_LOAD_IND,
-		RSL_MT_NOT_CMD,
+		RSL_MT_SACCH_FILL	('00011010'B),
+		RSL_MT_OVERLOAD		('00011011'B),
+		RSL_MT_ERROR_REPORT	('00011100'B),
+		RSL_MT_SMS_BC_CMD	('00011101'B),
+		RSL_MT_CBCH_LOAD_IND	('00011110'B),
+		RSL_MT_NOT_CMD		('00011111'B),
 
 		/* Dedicate Channel Management */
 		RSL_MT_CHAN_ACTIV	('00100001'B),
-		RSL_MT_CHAN_ACTIV_ACK,
-		RSL_MT_CHAN_ACTIV_NACK,
-		RSL_MT_CONN_FAIL,
-		RSL_MT_DEACTIVATE_SACCH,
-		RSL_MT_ENCR_CMD,
-		RSL_MT_HANDO_DET,
-		RSL_MT_MEAS_RES,
-		RSL_MT_MODE_MODIFY_REQ,
-		RSL_MT_MODE_MODIFY_ACK,
-		RSL_MT_MODE_MODIFY_NACK,
-		RSL_MT_PHY_CONTEXT_REQ,
-		RSL_MT_PHY_CONTEXT_CONF,
-		RSL_MT_RF_CHAN_REL,
-		RSL_MT_MS_POWER_CONTROL,
-		RSL_MT_BS_POWER_CONTROL,		/* 0x30 */
-		RSL_MT_PREPROC_CONFIG,
-		RSL_MT_PREPROC_MEAS_RES,
-		RSL_MT_RF_CHAN_REL_ACK,
-		RSL_MT_SACCH_INFO_MODIFY,
-		RSL_MT_TALKER_DET,
-		RSL_MT_LISTENER_DET,
-		RSL_MT_REMOTE_CODEC_CONF_REP,
-		RSL_MT_RTD_REP,
-		RSL_MT_PRE_HANDO_NOTIF,
-		RSL_MT_MR_CODEC_MOD_REQ,
-		RSL_MT_MR_CODEC_MOD_ACK,
-		RSL_MT_MR_CODEC_MOD_NACK,
-		RSL_MT_MR_CODEC_MOD_PER,
-		RSL_MT_TFO_REP,
-		RSL_MT_TFO_MOD_REQ,		/* 0x3f */
+		RSL_MT_CHAN_ACTIV_ACK	('00100010'B),
+		RSL_MT_CHAN_ACTIV_NACK	('00100011'B),
+		RSL_MT_CONN_FAIL	('00100100'B),
+		RSL_MT_DEACTIVATE_SACCH	('00100101'B),
+		RSL_MT_ENCR_CMD		('00100110'B),
+		RSL_MT_HANDO_DET	('00100111'B),
+		RSL_MT_MEAS_RES		('00101000'B),
+		RSL_MT_MODE_MODIFY_REQ	('00101001'B),
+		RSL_MT_MODE_MODIFY_ACK	('00101010'B),
+		RSL_MT_MODE_MODIFY_NACK	('00101011'B),
+		RSL_MT_PHY_CONTEXT_REQ	('00101100'B),
+		RSL_MT_PHY_CONTEXT_CONF	('00101101'B),
+		RSL_MT_RF_CHAN_REL	('00101110'B),
+		RSL_MT_MS_POWER_CONTROL ('00101111'B),
+		RSL_MT_BS_POWER_CONTROL	('00110000'B),		/* 0x30 */
+		RSL_MT_PREPROC_CONFIG	('00110001'B),
+		RSL_MT_PREPROC_MEAS_RES	('00110010'B),
+		RSL_MT_RF_CHAN_REL_ACK	('00110011'B),
+		RSL_MT_SACCH_INFO_MODIFY('00110100'B),
+		RSL_MT_TALKER_DET	('00110101'B),
+		RSL_MT_LISTENER_DET	('00110110'B),
+		RSL_MT_REMOTE_CODEC_CONF_REP ('00110111'B),
+		RSL_MT_RTD_REP		('00111000'B),
+		RSL_MT_PRE_HANDO_NOTIF	('00111001'B),
+		RSL_MT_MR_CODEC_MOD_REQ	('00111010'B),
+		RSL_MT_MR_CODEC_MOD_ACK	('00111011'B),
+		RSL_MT_MR_CODEC_MOD_NACK ('00111100'B),
+		RSL_MT_MR_CODEC_MOD_PER	('00111101'B),
+		RSL_MT_TFO_REP		('00111110'B),
+		RSL_MT_TFO_MOD_REQ	('00111111'B),		/* 0x3f */
 
 		RSL_MT_LOCATION_INFO		('01000001'B),
 
@@ -104,11 +104,11 @@
 		RSL_MT_IPAC_DIR_RETR_ENQ	('01000000'B),
 
 		RSL_MT_IPAC_PDCH_ACT		('01001000'B),
-		RSL_MT_IPAC_PDCH_ACT_ACK,
-		RSL_MT_IPAC_PDCH_ACT_NACK,
+		RSL_MT_IPAC_PDCH_ACT_ACK	('01001001'B),
+		RSL_MT_IPAC_PDCH_ACT_NACK	('01001010'B),
 		RSL_MT_IPAC_PDCH_DEACT		('01001011'B),
-		RSL_MT_IPAC_PDCH_DEACT_ACK,
-		RSL_MT_IPAC_PDCH_DEACT_NACK,
+		RSL_MT_IPAC_PDCH_DEACT_ACK	('01001100'B),
+		RSL_MT_IPAC_PDCH_DEACT_NACK	('01001101'B),
 
 		RSL_MT_IPAC_CONNECT_MUX		('01010000'B),
 		RSL_MT_IPAC_CONNECT_MUX_ACK,
@@ -137,86 +137,86 @@
 	/*! RSL Information Element Identifiers (Chapter 9.3) */
 	type enumerated RSL_IE_Type {
 		RSL_IE_CHAN_NR			('00000001'B),
-		RSL_IE_LINK_IDENT,
-		RSL_IE_ACT_TYPE,
-		RSL_IE_BS_POWER,
-		RSL_IE_CHAN_IDENT,
-		RSL_IE_CHAN_MODE,
-		RSL_IE_ENCR_INFO,
-		RSL_IE_FRAME_NUMBER,
-		RSL_IE_HANDO_REF,
-		RSL_IE_L1_INFO,
-		RSL_IE_L3_INFO,
-		RSL_IE_MS_IDENTITY,
-		RSL_IE_MS_POWER,
-		RSL_IE_PAGING_GROUP,
-		RSL_IE_PAGING_LOAD,
-		RSL_IE_PYHS_CONTEXT,
-		RSL_IE_ACCESS_DELAY,
-		RSL_IE_RACH_LOAD,
-		RSL_IE_REQ_REFERENCE,
-		RSL_IE_RELEASE_MODE,
-		RSL_IE_RESOURCE_INFO,
-		RSL_IE_RLM_CAUSE,
-		RSL_IE_STARTNG_TIME,
-		RSL_IE_TIMING_ADVANCE,
-		RSL_IE_UPLINK_MEAS,
-		RSL_IE_CAUSE,
-		RSL_IE_MEAS_RES_NR,
-		RSL_IE_MSG_ID,
+		RSL_IE_LINK_IDENT		('00000010'B),
+		RSL_IE_ACT_TYPE			('00000011'B),
+		RSL_IE_BS_POWER			('00000100'B),
+		RSL_IE_CHAN_IDENT		('00000101'B),
+		RSL_IE_CHAN_MODE		('00000110'B),
+		RSL_IE_ENCR_INFO		('00000111'B),
+		RSL_IE_FRAME_NUMBER		('00001000'B),
+		RSL_IE_HANDO_REF		('00001001'B),
+		RSL_IE_L1_INFO			('00001010'B),
+		RSL_IE_L3_INFO			('00001011'B),
+		RSL_IE_MS_IDENTITY		('00001100'B),
+		RSL_IE_MS_POWER			('00001101'B),
+		RSL_IE_PAGING_GROUP		('00001110'B),
+		RSL_IE_PAGING_LOAD		('00001111'B),
+		RSL_IE_PYHS_CONTEXT		('00010000'B),
+		RSL_IE_ACCESS_DELAY		('00010001'B),
+		RSL_IE_RACH_LOAD		('00010010'B),
+		RSL_IE_REQ_REFERENCE		('00010011'B),
+		RSL_IE_RELEASE_MODE		('00010100'B),
+		RSL_IE_RESOURCE_INFO		('00010101'B),
+		RSL_IE_RLM_CAUSE		('00010110'B),
+		RSL_IE_STARTNG_TIME		('00010111'B),
+		RSL_IE_TIMING_ADVANCE		('00011000'B),
+		RSL_IE_UPLINK_MEAS		('00011001'B),
+		RSL_IE_CAUSE			('00011010'B),
+		RSL_IE_MEAS_RES_NR		('00011011'B),
+		RSL_IE_MSG_ID			('00011100'B),
 		/* reserved */
 		RSL_IE_SYSINFO_TYPE		('00011110'B),
-		RSL_IE_MS_POWER_PARAM,
-		RSL_IE_BS_POWER_PARAM,
-		RSL_IE_PREPROC_PARAM,
-		RSL_IE_PREPROC_MEAS,
-		RSL_IE_IMM_ASS_INFO,		/* Phase 1 (3.6.0), later Full below */
-		RSL_IE_SMSCB_INFO,
-		RSL_IE_MS_TIMING_OFFSET,
-		RSL_IE_ERR_MSG,
-		RSL_IE_FULL_BCCH_INFO,
-		RSL_IE_CHAN_NEEDED,
-		RSL_IE_CB_CMD_TYPE,
-		RSL_IE_SMSCB_MSG,
-		RSL_IE_FULL_IMM_ASS_INFO,
-		RSL_IE_SACCH_INFO,
-		RSL_IE_CBCH_LOAD_INFO,
-		RSL_IE_SMSCB_CHAN_INDICATOR,
-		RSL_IE_GROUP_CALL_REF,
-		RSL_IE_CHAN_DESC,
-		RSL_IE_NCH_DRX_INFO,
-		RSL_IE_CMD_INDICATOR,
-		RSL_IE_EMLPP_PRIO,
-		RSL_IE_UIC,
-		RSL_IE_MAIN_CHAN_REF,
-		RSL_IE_MR_CONFIG,
-		RSL_IE_MR_CONTROL,
-		RSL_IE_SUP_CODEC_TYPES,
-		RSL_IE_CODEC_CONFIG,
-		RSL_IE_RTD,
-		RSL_IE_TFO_STATUS,
-		RSL_IE_LLP_APDU,
+		RSL_IE_MS_POWER_PARAM		('00011111'B),
+		RSL_IE_BS_POWER_PARAM		('00100000'B),
+		RSL_IE_PREPROC_PARAM		('00100001'B),
+		RSL_IE_PREPROC_MEAS		('00100010'B),
+		RSL_IE_IMM_ASS_INFO		('00100011'B),/* Phase 1 (3.6.0), later Full below */
+		RSL_IE_SMSCB_INFO		('00100100'B),
+		RSL_IE_MS_TIMING_OFFSET		('00100101'B),
+		RSL_IE_ERR_MSG			('00100110'B),
+		RSL_IE_FULL_BCCH_INFO		('00100111'B),
+		RSL_IE_CHAN_NEEDED		('00101000'B),
+		RSL_IE_CB_CMD_TYPE		('00101001'B),
+		RSL_IE_SMSCB_MSG		('00101010'B),
+		RSL_IE_FULL_IMM_ASS_INFO	('00101011'B),
+		RSL_IE_SACCH_INFO		('00101100'B),
+		RSL_IE_CBCH_LOAD_INFO		('00101101'B),
+		RSL_IE_SMSCB_CHAN_INDICATOR	('00101110'B),
+		RSL_IE_GROUP_CALL_REF		('00101111'B),
+		RSL_IE_CHAN_DESC		('00110000'B),
+		RSL_IE_NCH_DRX_INFO		('00110001'B),
+		RSL_IE_CMD_INDICATOR		('00110010'B),
+		RSL_IE_EMLPP_PRIO		('00110011'B),
+		RSL_IE_UIC			('00110100'B),
+		RSL_IE_MAIN_CHAN_REF		('00110101'B),
+		RSL_IE_MR_CONFIG		('00110110'B),
+		RSL_IE_MR_CONTROL		('00110111'B),
+		RSL_IE_SUP_CODEC_TYPES		('00111000'B),
+		RSL_IE_CODEC_CONFIG		('00111001'B),
+		RSL_IE_RTD			('00111010'B),
+		RSL_IE_TFO_STATUS		('00111011'B),
+		RSL_IE_LLP_APDU			('00111100'B),
 
 		/* ip.access */
 		RSL_IE_IPAC_SRTP_CONFIG		('11100000'B),
-		RSL_IE_IPAC_PROXY_UDP,
-		RSL_IE_IPAC_BSCMPL_TOUT,
+		RSL_IE_IPAC_PROXY_UDP		('11100001'B),
+		RSL_IE_IPAC_BSCMPL_TOUT		('11100010'B),
 
 		RSL_IE_IPAC_REMOTE_IP		('11110000'B),
-		RSL_IE_IPAC_REMOTE_PORT,
-		RSL_IE_IPAC_RTP_PAYLOAD,
-		RSL_IE_IPAC_LOCAL_PORT,
-		RSL_IE_IPAC_SPEECH_MODE,
-		RSL_IE_IPAC_LOCAL_IP,
-		RSL_IE_IPAC_CONN_STAT,
-		RSL_IE_IPAC_HO_C_PARMS,
-		RSL_IE_IPAC_CONN_ID,
-		RSL_IE_IPAC_RTP_CSD_FMT,
-		RSL_IE_IPAC_RTP_JIT_BUF,
-		RSL_IE_IPAC_RTP_COMPR,
-		RSL_IE_IPAC_RTP_PAYLOAD2,
-		RSL_IE_IPAC_RTP_MPLEX,
-		RSL_IE_IPAC_RTP_MPLEX_ID
+		RSL_IE_IPAC_REMOTE_PORT		('11110001'B),
+		RSL_IE_IPAC_RTP_PAYLOAD		('11110010'B),
+		RSL_IE_IPAC_LOCAL_PORT		('11110011'B),
+		RSL_IE_IPAC_SPEECH_MODE		('11110100'B),
+		RSL_IE_IPAC_LOCAL_IP		('11110101'B),
+		RSL_IE_IPAC_CONN_STAT		('11110110'B),
+		RSL_IE_IPAC_HO_C_PARMS		('11110111'B),
+		RSL_IE_IPAC_CONN_ID		('11111000'B),
+		RSL_IE_IPAC_RTP_CSD_FMT		('11111001'B),
+		RSL_IE_IPAC_RTP_JIT_BUF		('11111010'B),
+		RSL_IE_IPAC_RTP_COMPR		('11111011'B),
+		RSL_IE_IPAC_RTP_PAYLOAD2	('11111100'B),
+		RSL_IE_IPAC_RTP_MPLEX		('11111101'B),
+		RSL_IE_IPAC_RTP_MPLEX_ID	('11111110'B)
 	} with { variant "FIELDLENGTH(8)" };
 
 	type record RSL_LV {