diff --git a/mgw/MGCP_Types.ttcn b/mgw/MGCP_Types.ttcn
index 13d1f89..3616ddf 100644
--- a/mgw/MGCP_Types.ttcn
+++ b/mgw/MGCP_Types.ttcn
@@ -7,8 +7,9 @@
 	};
 	type charstring MgcpTransId 	(pattern "\d#(1,9)");
 	type charstring MgcpEndpoint	(pattern "*@*");
-	/* 3.2.2.5 */
-	type hexstring MgcpConnectionId length(32);
+	type hexstring MgcpCallId	length(1..32);	/* 3.2.2.2 */
+	type hexstring MgcpConnectionId	length(1..32);	/* 3.2.2.5 */
+	type hexstring MgcpRequestId	length(1..32);	/* 3.2.2.18 */
 	type charstring MgcpResponseCode (pattern "\d#(3)");
 
 	type charstring MgcpInfoCode ("B", "C", "I", "N", "X", "L", "M", "R",
@@ -18,6 +19,15 @@
 		variant "TEXT_CODING(,convert=upper_case,'([BCINXLMRSDOPEZQTA])|(RC)|(LC)|(ES)|(RM)|(RD)|(PL)|(MD)|(X-Osmo-CP)',case_insensitive)"
 	};
 
+	/* 3.2.2.6 */
+	type charstring MgcpConnectionMode ("sendonly", "recvonly", "sendrecv", "confrnce",
+					    "inactive", "loopback", "conttest", "netwloop",
+					    "netwtest");
+
+	/* 3.2.2.10 */
+	type charstring MgcpLocalConnOptKeys ("a", "p", "b", "t", "e", "gc", "s", "r", "k",
+					      "nt", "r");
+
 	type charstring MgcpVersion (pattern "\d.\d") with {
 		variant "BEGIN('MGCP ')"
 	}