From: Francis Dupont <fdupont@isc.org>
Date: Tue, 20 Nov 2018 14:11:20 +0000 (+0000)
Subject: [#268,!125] Regen flex/bison
X-Git-Tag: 204-move-models-base~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=478b5230607191617c8cd4af55009b29922bd002;p=thirdparty%2Fkea.git

[#268,!125] Regen flex/bison
---

diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
index f290a2253b..ccd6b950ae 100644
--- a/src/bin/dhcp4/dhcp4_lexer.cc
+++ b/src/bin/dhcp4/dhcp4_lexer.cc
@@ -1683,19 +1683,19 @@ static const flex_int16_t yy_rule_linenum[175] =
       364,  373,  382,  391,  400,  411,  422,  433,  444,  454,
       464,  475,  486,  497,  508,  519,  530,  541,  552,  563,
       574,  585,  594,  603,  613,  622,  632,  646,  662,  671,
-      680,  689,  698,  719,  740,  749,  759,  768,  778,  787,
-      796,  805,  814,  823,  833,  842,  851,  860,  869,  878,
-      887,  896,  905,  914,  923,  933,  944,  956,  965,  974,
-      984,  994, 1004, 1014, 1024, 1034, 1043, 1053, 1062, 1071,
-
-     1080, 1089, 1099, 1109, 1118, 1128, 1137, 1146, 1155, 1164,
-     1173, 1182, 1191, 1200, 1209, 1218, 1227, 1236, 1245, 1254,
-     1263, 1272, 1281, 1290, 1299, 1308, 1317, 1326, 1335, 1344,
-     1353, 1362, 1371, 1380, 1389, 1398, 1408, 1418, 1428, 1438,
-     1448, 1458, 1468, 1478, 1488, 1497, 1506, 1515, 1524, 1533,
-     1542, 1551, 1562, 1573, 1586, 1599, 1614, 1713, 1718, 1723,
-     1728, 1729, 1730, 1731, 1732, 1733, 1735, 1753, 1766, 1771,
-     1775, 1777, 1779, 1781
+      680,  689,  698,  719,  740,  749,  759,  768,  779,  788,
+      797,  806,  815,  824,  834,  843,  852,  861,  870,  879,
+      888,  897,  906,  915,  924,  934,  945,  957,  966,  975,
+      985,  995, 1005, 1015, 1025, 1035, 1044, 1054, 1063, 1072,
+
+     1081, 1090, 1100, 1110, 1119, 1129, 1138, 1147, 1156, 1165,
+     1174, 1183, 1192, 1201, 1210, 1219, 1228, 1237, 1246, 1255,
+     1264, 1273, 1282, 1291, 1300, 1309, 1318, 1327, 1336, 1345,
+     1354, 1363, 1372, 1381, 1390, 1399, 1409, 1419, 1429, 1439,
+     1449, 1459, 1469, 1479, 1489, 1498, 1507, 1516, 1525, 1534,
+     1543, 1552, 1563, 1574, 1587, 1600, 1615, 1714, 1719, 1724,
+     1729, 1730, 1731, 1732, 1733, 1734, 1736, 1754, 1767, 1772,
+     1776, 1778, 1780, 1782
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -3019,6 +3019,7 @@ YY_RULE_SETUP
 #line 768 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
+    case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::SUBNET4:
     case isc::dhcp::Parser4Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp4Parser::make_RESERVATION_MODE(driver.loc_);
@@ -3029,7 +3030,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 778 "dhcp4_lexer.ll"
+#line 779 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -3041,7 +3042,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 787 "dhcp4_lexer.ll"
+#line 788 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -3053,7 +3054,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 796 "dhcp4_lexer.ll"
+#line 797 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -3065,7 +3066,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 805 "dhcp4_lexer.ll"
+#line 806 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -3077,7 +3078,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 814 "dhcp4_lexer.ll"
+#line 815 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -3089,7 +3090,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 823 "dhcp4_lexer.ll"
+#line 824 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -3102,7 +3103,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 833 "dhcp4_lexer.ll"
+#line 834 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3114,7 +3115,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 842 "dhcp4_lexer.ll"
+#line 843 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -3126,7 +3127,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 851 "dhcp4_lexer.ll"
+#line 852 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGING:
@@ -3138,7 +3139,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 860 "dhcp4_lexer.ll"
+#line 861 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGERS:
@@ -3150,7 +3151,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 869 "dhcp4_lexer.ll"
+#line 870 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -3162,7 +3163,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 878 "dhcp4_lexer.ll"
+#line 879 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGERS:
@@ -3174,7 +3175,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 887 "dhcp4_lexer.ll"
+#line 888 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -3186,7 +3187,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 896 "dhcp4_lexer.ll"
+#line 897 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -3198,7 +3199,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 905 "dhcp4_lexer.ll"
+#line 906 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -3210,7 +3211,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 914 "dhcp4_lexer.ll"
+#line 915 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGERS:
@@ -3222,7 +3223,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 923 "dhcp4_lexer.ll"
+#line 924 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3235,7 +3236,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 933 "dhcp4_lexer.ll"
+#line 934 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3249,7 +3250,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 944 "dhcp4_lexer.ll"
+#line 945 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3264,7 +3265,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 956 "dhcp4_lexer.ll"
+#line 957 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
@@ -3276,7 +3277,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 965 "dhcp4_lexer.ll"
+#line 966 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
@@ -3288,7 +3289,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 974 "dhcp4_lexer.ll"
+#line 975 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3301,7 +3302,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 984 "dhcp4_lexer.ll"
+#line 985 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3314,7 +3315,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 994 "dhcp4_lexer.ll"
+#line 995 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3327,7 +3328,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 1004 "dhcp4_lexer.ll"
+#line 1005 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3340,7 +3341,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 1014 "dhcp4_lexer.ll"
+#line 1015 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3353,7 +3354,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 1024 "dhcp4_lexer.ll"
+#line 1025 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3366,7 +3367,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 1034 "dhcp4_lexer.ll"
+#line 1035 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATIONS:
@@ -3378,7 +3379,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 1043 "dhcp4_lexer.ll"
+#line 1044 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -3391,7 +3392,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 1053 "dhcp4_lexer.ll"
+#line 1054 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DATA:
@@ -3403,7 +3404,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 1062 "dhcp4_lexer.ll"
+#line 1063 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -3415,7 +3416,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 1071 "dhcp4_lexer.ll"
+#line 1072 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -3427,7 +3428,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 1080 "dhcp4_lexer.ll"
+#line 1081 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -3439,7 +3440,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 1089 "dhcp4_lexer.ll"
+#line 1090 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3452,7 +3453,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 1099 "dhcp4_lexer.ll"
+#line 1100 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RELAY:
@@ -3465,7 +3466,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 1109 "dhcp4_lexer.ll"
+#line 1110 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RELAY:
@@ -3477,7 +3478,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 1118 "dhcp4_lexer.ll"
+#line 1119 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3489,7 +3490,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 1128 "dhcp4_lexer.ll"
+#line 1129 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOOKS_LIBRARIES:
@@ -3501,7 +3502,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 1137 "dhcp4_lexer.ll"
+#line 1138 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOOKS_LIBRARIES:
@@ -3513,7 +3514,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 1146 "dhcp4_lexer.ll"
+#line 1147 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3525,7 +3526,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 1155 "dhcp4_lexer.ll"
+#line 1156 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3537,7 +3538,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 1164 "dhcp4_lexer.ll"
+#line 1165 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3549,7 +3550,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 1173 "dhcp4_lexer.ll"
+#line 1174 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3561,7 +3562,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 1182 "dhcp4_lexer.ll"
+#line 1183 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3573,7 +3574,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 1191 "dhcp4_lexer.ll"
+#line 1192 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3585,7 +3586,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 1200 "dhcp4_lexer.ll"
+#line 1201 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3597,7 +3598,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 1209 "dhcp4_lexer.ll"
+#line 1210 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3609,7 +3610,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 1218 "dhcp4_lexer.ll"
+#line 1219 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3621,7 +3622,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 1227 "dhcp4_lexer.ll"
+#line 1228 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONTROL_SOCKET:
@@ -3633,7 +3634,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 1236 "dhcp4_lexer.ll"
+#line 1237 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONTROL_SOCKET:
@@ -3645,7 +3646,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 1245 "dhcp4_lexer.ll"
+#line 1246 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3657,7 +3658,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 1254 "dhcp4_lexer.ll"
+#line 1255 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3669,7 +3670,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 1263 "dhcp4_lexer.ll"
+#line 1264 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3681,7 +3682,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 1272 "dhcp4_lexer.ll"
+#line 1273 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3693,7 +3694,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 1281 "dhcp4_lexer.ll"
+#line 1282 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3705,7 +3706,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 1290 "dhcp4_lexer.ll"
+#line 1291 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3717,7 +3718,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 1299 "dhcp4_lexer.ll"
+#line 1300 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3729,7 +3730,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 1308 "dhcp4_lexer.ll"
+#line 1309 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3741,7 +3742,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 1317 "dhcp4_lexer.ll"
+#line 1318 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3753,7 +3754,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 1326 "dhcp4_lexer.ll"
+#line 1327 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3765,7 +3766,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 1335 "dhcp4_lexer.ll"
+#line 1336 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3777,7 +3778,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 1344 "dhcp4_lexer.ll"
+#line 1345 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3789,7 +3790,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 1353 "dhcp4_lexer.ll"
+#line 1354 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3801,7 +3802,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 1362 "dhcp4_lexer.ll"
+#line 1363 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3813,7 +3814,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 1371 "dhcp4_lexer.ll"
+#line 1372 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3825,7 +3826,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 1380 "dhcp4_lexer.ll"
+#line 1381 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3837,7 +3838,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 1389 "dhcp4_lexer.ll"
+#line 1390 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3849,7 +3850,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 1398 "dhcp4_lexer.ll"
+#line 1399 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) {
@@ -3862,7 +3863,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 1408 "dhcp4_lexer.ll"
+#line 1409 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) {
@@ -3875,7 +3876,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 1418 "dhcp4_lexer.ll"
+#line 1419 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_FORMAT) {
@@ -3888,7 +3889,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 1428 "dhcp4_lexer.ll"
+#line 1429 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3901,7 +3902,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 1438 "dhcp4_lexer.ll"
+#line 1439 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3914,7 +3915,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 1448 "dhcp4_lexer.ll"
+#line 1449 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3927,7 +3928,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 1458 "dhcp4_lexer.ll"
+#line 1459 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3940,7 +3941,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 1468 "dhcp4_lexer.ll"
+#line 1469 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3953,7 +3954,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 1478 "dhcp4_lexer.ll"
+#line 1479 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3966,7 +3967,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 1488 "dhcp4_lexer.ll"
+#line 1489 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -3978,7 +3979,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 1497 "dhcp4_lexer.ll"
+#line 1498 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -3990,7 +3991,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 1506 "dhcp4_lexer.ll"
+#line 1507 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -4002,7 +4003,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 1515 "dhcp4_lexer.ll"
+#line 1516 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -4014,7 +4015,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 1524 "dhcp4_lexer.ll"
+#line 1525 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -4026,7 +4027,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 1533 "dhcp4_lexer.ll"
+#line 1534 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -4038,7 +4039,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 1542 "dhcp4_lexer.ll"
+#line 1543 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4050,7 +4051,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 1551 "dhcp4_lexer.ll"
+#line 1552 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4064,7 +4065,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 1562 "dhcp4_lexer.ll"
+#line 1563 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4078,7 +4079,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 1573 "dhcp4_lexer.ll"
+#line 1574 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4094,7 +4095,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 1586 "dhcp4_lexer.ll"
+#line 1587 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4110,7 +4111,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 1599 "dhcp4_lexer.ll"
+#line 1600 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4126,7 +4127,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 1614 "dhcp4_lexer.ll"
+#line 1615 "dhcp4_lexer.ll"
 {
     /* A string has been matched. It contains the actual string and single quotes.
        We need to get those quotes out of the way and just use its content, e.g.
@@ -4229,7 +4230,7 @@ YY_RULE_SETUP
 case 158:
 /* rule 158 can match eol */
 YY_RULE_SETUP
-#line 1713 "dhcp4_lexer.ll"
+#line 1714 "dhcp4_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
@@ -4238,7 +4239,7 @@ YY_RULE_SETUP
 case 159:
 /* rule 159 can match eol */
 YY_RULE_SETUP
-#line 1718 "dhcp4_lexer.ll"
+#line 1719 "dhcp4_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
@@ -4246,7 +4247,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 1723 "dhcp4_lexer.ll"
+#line 1724 "dhcp4_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
@@ -4254,37 +4255,37 @@ YY_RULE_SETUP
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 1728 "dhcp4_lexer.ll"
+#line 1729 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 1729 "dhcp4_lexer.ll"
+#line 1730 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 1730 "dhcp4_lexer.ll"
+#line 1731 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 1731 "dhcp4_lexer.ll"
+#line 1732 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 1732 "dhcp4_lexer.ll"
+#line 1733 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 1733 "dhcp4_lexer.ll"
+#line 1734 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 1735 "dhcp4_lexer.ll"
+#line 1736 "dhcp4_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -4305,7 +4306,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 1753 "dhcp4_lexer.ll"
+#line 1754 "dhcp4_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -4321,7 +4322,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 1766 "dhcp4_lexer.ll"
+#line 1767 "dhcp4_lexer.ll"
 {
     string tmp(yytext);
     return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -4329,33 +4330,33 @@ YY_RULE_SETUP
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 1771 "dhcp4_lexer.ll"
+#line 1772 "dhcp4_lexer.ll"
 {
    return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_);
 }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 1775 "dhcp4_lexer.ll"
+#line 1776 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 1777 "dhcp4_lexer.ll"
+#line 1778 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 1779 "dhcp4_lexer.ll"
+#line 1780 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 1781 "dhcp4_lexer.ll"
+#line 1782 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1783 "dhcp4_lexer.ll"
+#line 1784 "dhcp4_lexer.ll"
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp4Parser::make_END(driver.loc_);
@@ -4381,10 +4382,10 @@ case YY_STATE_EOF(INITIAL):
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 1806 "dhcp4_lexer.ll"
+#line 1807 "dhcp4_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 4387 "dhcp4_lexer.cc"
+#line 4388 "dhcp4_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5489,7 +5490,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 1806 "dhcp4_lexer.ll"
+#line 1807 "dhcp4_lexer.ll"
 
 
 using namespace isc::dhcp;
diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc
index 3133a9312b..4874ba3b30 100644
--- a/src/bin/dhcp4/dhcp4_parser.cc
+++ b/src/bin/dhcp4/dhcp4_parser.cc
@@ -1059,8 +1059,8 @@ namespace isc { namespace dhcp {
 #line 1060 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 107:
-#line 470 "dhcp4_parser.yy" // lalr1.cc:907
+  case 108:
+#line 471 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("valid-lifetime", prf);
@@ -1068,8 +1068,8 @@ namespace isc { namespace dhcp {
 #line 1069 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 108:
-#line 475 "dhcp4_parser.yy" // lalr1.cc:907
+  case 109:
+#line 476 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("renew-timer", prf);
@@ -1077,8 +1077,8 @@ namespace isc { namespace dhcp {
 #line 1078 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 109:
-#line 480 "dhcp4_parser.yy" // lalr1.cc:907
+  case 110:
+#line 481 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rebind-timer", prf);
@@ -1086,8 +1086,8 @@ namespace isc { namespace dhcp {
 #line 1087 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 110:
-#line 485 "dhcp4_parser.yy" // lalr1.cc:907
+  case 111:
+#line 486 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("decline-probation-period", dpp);
@@ -1095,16 +1095,16 @@ namespace isc { namespace dhcp {
 #line 1096 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 111:
-#line 490 "dhcp4_parser.yy" // lalr1.cc:907
+  case 112:
+#line 491 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1104 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 112:
-#line 492 "dhcp4_parser.yy" // lalr1.cc:907
+  case 113:
+#line 493 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr stag(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-tag", stag);
@@ -1113,8 +1113,8 @@ namespace isc { namespace dhcp {
 #line 1114 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 113:
-#line 498 "dhcp4_parser.yy" // lalr1.cc:907
+  case 114:
+#line 499 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr echo(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("echo-client-id", echo);
@@ -1122,8 +1122,8 @@ namespace isc { namespace dhcp {
 #line 1123 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 114:
-#line 503 "dhcp4_parser.yy" // lalr1.cc:907
+  case 115:
+#line 504 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr match(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("match-client-id", match);
@@ -1131,8 +1131,8 @@ namespace isc { namespace dhcp {
 #line 1132 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 115:
-#line 508 "dhcp4_parser.yy" // lalr1.cc:907
+  case 116:
+#line 509 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("authoritative", prf);
@@ -1140,8 +1140,8 @@ namespace isc { namespace dhcp {
 #line 1141 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 116:
-#line 514 "dhcp4_parser.yy" // lalr1.cc:907
+  case 117:
+#line 515 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces-config", i);
@@ -1151,8 +1151,8 @@ namespace isc { namespace dhcp {
 #line 1152 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 117:
-#line 519 "dhcp4_parser.yy" // lalr1.cc:907
+  case 118:
+#line 520 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // No interfaces config param is required
     ctx.stack_.pop_back();
@@ -1161,8 +1161,8 @@ namespace isc { namespace dhcp {
 #line 1162 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 127:
-#line 538 "dhcp4_parser.yy" // lalr1.cc:907
+  case 128:
+#line 539 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Parse the interfaces-config map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1171,8 +1171,8 @@ namespace isc { namespace dhcp {
 #line 1172 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 128:
-#line 542 "dhcp4_parser.yy" // lalr1.cc:907
+  case 129:
+#line 543 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // No interfaces config param is required
     // parsing completed
@@ -1180,8 +1180,8 @@ namespace isc { namespace dhcp {
 #line 1181 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 129:
-#line 547 "dhcp4_parser.yy" // lalr1.cc:907
+  case 130:
+#line 548 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces", l);
@@ -1191,8 +1191,8 @@ namespace isc { namespace dhcp {
 #line 1192 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 130:
-#line 552 "dhcp4_parser.yy" // lalr1.cc:907
+  case 131:
+#line 553 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1200,16 +1200,16 @@ namespace isc { namespace dhcp {
 #line 1201 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 131:
-#line 557 "dhcp4_parser.yy" // lalr1.cc:907
+  case 132:
+#line 558 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.DHCP_SOCKET_TYPE);
 }
 #line 1209 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 132:
-#line 559 "dhcp4_parser.yy" // lalr1.cc:907
+  case 133:
+#line 560 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("dhcp-socket-type", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1217,28 +1217,28 @@ namespace isc { namespace dhcp {
 #line 1218 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 133:
-#line 564 "dhcp4_parser.yy" // lalr1.cc:907
+  case 134:
+#line 565 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("raw", ctx.loc2pos(yystack_[0].location))); }
 #line 1224 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 134:
-#line 565 "dhcp4_parser.yy" // lalr1.cc:907
+  case 135:
+#line 566 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("udp", ctx.loc2pos(yystack_[0].location))); }
 #line 1230 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 135:
-#line 568 "dhcp4_parser.yy" // lalr1.cc:907
+  case 136:
+#line 569 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.OUTBOUND_INTERFACE);
 }
 #line 1238 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 136:
-#line 570 "dhcp4_parser.yy" // lalr1.cc:907
+  case 137:
+#line 571 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("outbound-interface", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1246,24 +1246,24 @@ namespace isc { namespace dhcp {
 #line 1247 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 137:
-#line 575 "dhcp4_parser.yy" // lalr1.cc:907
+  case 138:
+#line 576 "dhcp4_parser.yy" // lalr1.cc:907
     {
     yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("same-as-inbound", ctx.loc2pos(yystack_[0].location)));
 }
 #line 1255 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 138:
-#line 577 "dhcp4_parser.yy" // lalr1.cc:907
+  case 139:
+#line 578 "dhcp4_parser.yy" // lalr1.cc:907
     {
     yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("use-routing", ctx.loc2pos(yystack_[0].location)));
     }
 #line 1263 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 139:
-#line 581 "dhcp4_parser.yy" // lalr1.cc:907
+  case 140:
+#line 582 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("re-detect", b);
@@ -1271,8 +1271,8 @@ namespace isc { namespace dhcp {
 #line 1272 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 140:
-#line 587 "dhcp4_parser.yy" // lalr1.cc:907
+  case 141:
+#line 588 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lease-database", i);
@@ -1282,8 +1282,8 @@ namespace isc { namespace dhcp {
 #line 1283 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 141:
-#line 592 "dhcp4_parser.yy" // lalr1.cc:907
+  case 142:
+#line 593 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1293,8 +1293,8 @@ namespace isc { namespace dhcp {
 #line 1294 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 142:
-#line 599 "dhcp4_parser.yy" // lalr1.cc:907
+  case 143:
+#line 600 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sanity-checks", m);
@@ -1304,8 +1304,8 @@ namespace isc { namespace dhcp {
 #line 1305 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 143:
-#line 604 "dhcp4_parser.yy" // lalr1.cc:907
+  case 144:
+#line 605 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1313,16 +1313,16 @@ namespace isc { namespace dhcp {
 #line 1314 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 147:
-#line 614 "dhcp4_parser.yy" // lalr1.cc:907
+  case 148:
+#line 615 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1322 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 148:
-#line 616 "dhcp4_parser.yy" // lalr1.cc:907
+  case 149:
+#line 617 "dhcp4_parser.yy" // lalr1.cc:907
     {
 
     if ( (string(yystack_[0].value.as< std::string > ()) == "none") ||
@@ -1341,8 +1341,8 @@ namespace isc { namespace dhcp {
 #line 1342 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 149:
-#line 632 "dhcp4_parser.yy" // lalr1.cc:907
+  case 150:
+#line 633 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-database", i);
@@ -1352,8 +1352,8 @@ namespace isc { namespace dhcp {
 #line 1353 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 150:
-#line 637 "dhcp4_parser.yy" // lalr1.cc:907
+  case 151:
+#line 638 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1363,8 +1363,8 @@ namespace isc { namespace dhcp {
 #line 1364 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 151:
-#line 644 "dhcp4_parser.yy" // lalr1.cc:907
+  case 152:
+#line 645 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-databases", l);
@@ -1374,8 +1374,8 @@ namespace isc { namespace dhcp {
 #line 1375 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 152:
-#line 649 "dhcp4_parser.yy" // lalr1.cc:907
+  case 153:
+#line 650 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1383,8 +1383,8 @@ namespace isc { namespace dhcp {
 #line 1384 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 157:
-#line 662 "dhcp4_parser.yy" // lalr1.cc:907
+  case 158:
+#line 663 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1393,8 +1393,8 @@ namespace isc { namespace dhcp {
 #line 1394 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 158:
-#line 666 "dhcp4_parser.yy" // lalr1.cc:907
+  case 159:
+#line 667 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1403,16 +1403,16 @@ namespace isc { namespace dhcp {
 #line 1404 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 179:
-#line 696 "dhcp4_parser.yy" // lalr1.cc:907
+  case 180:
+#line 697 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.DATABASE_TYPE);
 }
 #line 1412 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 180:
-#line 698 "dhcp4_parser.yy" // lalr1.cc:907
+  case 181:
+#line 699 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1420,40 +1420,40 @@ namespace isc { namespace dhcp {
 #line 1421 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 181:
-#line 703 "dhcp4_parser.yy" // lalr1.cc:907
+  case 182:
+#line 704 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); }
 #line 1427 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 182:
-#line 704 "dhcp4_parser.yy" // lalr1.cc:907
+  case 183:
+#line 705 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); }
 #line 1433 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 183:
-#line 705 "dhcp4_parser.yy" // lalr1.cc:907
+  case 184:
+#line 706 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); }
 #line 1439 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 184:
-#line 706 "dhcp4_parser.yy" // lalr1.cc:907
+  case 185:
+#line 707 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); }
 #line 1445 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 185:
-#line 709 "dhcp4_parser.yy" // lalr1.cc:907
+  case 186:
+#line 710 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1453 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 186:
-#line 711 "dhcp4_parser.yy" // lalr1.cc:907
+  case 187:
+#line 712 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user", user);
@@ -1462,16 +1462,16 @@ namespace isc { namespace dhcp {
 #line 1463 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 187:
-#line 717 "dhcp4_parser.yy" // lalr1.cc:907
+  case 188:
+#line 718 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1471 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 188:
-#line 719 "dhcp4_parser.yy" // lalr1.cc:907
+  case 189:
+#line 720 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password", pwd);
@@ -1480,16 +1480,16 @@ namespace isc { namespace dhcp {
 #line 1481 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 189:
-#line 725 "dhcp4_parser.yy" // lalr1.cc:907
+  case 190:
+#line 726 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1489 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 190:
-#line 727 "dhcp4_parser.yy" // lalr1.cc:907
+  case 191:
+#line 728 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host", h);
@@ -1498,8 +1498,8 @@ namespace isc { namespace dhcp {
 #line 1499 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 191:
-#line 733 "dhcp4_parser.yy" // lalr1.cc:907
+  case 192:
+#line 734 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr p(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", p);
@@ -1507,16 +1507,16 @@ namespace isc { namespace dhcp {
 #line 1508 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 192:
-#line 738 "dhcp4_parser.yy" // lalr1.cc:907
+  case 193:
+#line 739 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1516 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 193:
-#line 740 "dhcp4_parser.yy" // lalr1.cc:907
+  case 194:
+#line 741 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
@@ -1525,8 +1525,8 @@ namespace isc { namespace dhcp {
 #line 1526 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 194:
-#line 746 "dhcp4_parser.yy" // lalr1.cc:907
+  case 195:
+#line 747 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("persist", n);
@@ -1534,8 +1534,8 @@ namespace isc { namespace dhcp {
 #line 1535 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 195:
-#line 751 "dhcp4_parser.yy" // lalr1.cc:907
+  case 196:
+#line 752 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lfc-interval", n);
@@ -1543,8 +1543,8 @@ namespace isc { namespace dhcp {
 #line 1544 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 196:
-#line 756 "dhcp4_parser.yy" // lalr1.cc:907
+  case 197:
+#line 757 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("readonly", n);
@@ -1552,8 +1552,8 @@ namespace isc { namespace dhcp {
 #line 1553 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 197:
-#line 761 "dhcp4_parser.yy" // lalr1.cc:907
+  case 198:
+#line 762 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("connect-timeout", n);
@@ -1561,8 +1561,8 @@ namespace isc { namespace dhcp {
 #line 1562 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 198:
-#line 766 "dhcp4_parser.yy" // lalr1.cc:907
+  case 199:
+#line 767 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("request-timeout", n);
@@ -1570,8 +1570,8 @@ namespace isc { namespace dhcp {
 #line 1571 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 199:
-#line 771 "dhcp4_parser.yy" // lalr1.cc:907
+  case 200:
+#line 772 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-keepalive", n);
@@ -1579,8 +1579,8 @@ namespace isc { namespace dhcp {
 #line 1580 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 200:
-#line 776 "dhcp4_parser.yy" // lalr1.cc:907
+  case 201:
+#line 777 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-nodelay", n);
@@ -1588,16 +1588,16 @@ namespace isc { namespace dhcp {
 #line 1589 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 201:
-#line 781 "dhcp4_parser.yy" // lalr1.cc:907
+  case 202:
+#line 782 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1597 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 202:
-#line 783 "dhcp4_parser.yy" // lalr1.cc:907
+  case 203:
+#line 784 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr cp(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("contact-points", cp);
@@ -1606,16 +1606,16 @@ namespace isc { namespace dhcp {
 #line 1607 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 203:
-#line 789 "dhcp4_parser.yy" // lalr1.cc:907
+  case 204:
+#line 790 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1615 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 204:
-#line 791 "dhcp4_parser.yy" // lalr1.cc:907
+  case 205:
+#line 792 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr ks(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("keyspace", ks);
@@ -1624,8 +1624,8 @@ namespace isc { namespace dhcp {
 #line 1625 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 205:
-#line 797 "dhcp4_parser.yy" // lalr1.cc:907
+  case 206:
+#line 798 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reconnect-tries", n);
@@ -1633,8 +1633,8 @@ namespace isc { namespace dhcp {
 #line 1634 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 206:
-#line 802 "dhcp4_parser.yy" // lalr1.cc:907
+  case 207:
+#line 803 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reconnect-wait-time", n);
@@ -1642,8 +1642,8 @@ namespace isc { namespace dhcp {
 #line 1643 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 207:
-#line 807 "dhcp4_parser.yy" // lalr1.cc:907
+  case 208:
+#line 808 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host-reservation-identifiers", l);
@@ -1653,8 +1653,8 @@ namespace isc { namespace dhcp {
 #line 1654 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 208:
-#line 812 "dhcp4_parser.yy" // lalr1.cc:907
+  case 209:
+#line 813 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1662,8 +1662,8 @@ namespace isc { namespace dhcp {
 #line 1663 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 216:
-#line 828 "dhcp4_parser.yy" // lalr1.cc:907
+  case 217:
+#line 829 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
@@ -1671,8 +1671,8 @@ namespace isc { namespace dhcp {
 #line 1672 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 217:
-#line 833 "dhcp4_parser.yy" // lalr1.cc:907
+  case 218:
+#line 834 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(hwaddr);
@@ -1680,8 +1680,8 @@ namespace isc { namespace dhcp {
 #line 1681 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 218:
-#line 838 "dhcp4_parser.yy" // lalr1.cc:907
+  case 219:
+#line 839 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr circuit(new StringElement("circuit-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(circuit);
@@ -1689,8 +1689,8 @@ namespace isc { namespace dhcp {
 #line 1690 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 219:
-#line 843 "dhcp4_parser.yy" // lalr1.cc:907
+  case 220:
+#line 844 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr client(new StringElement("client-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(client);
@@ -1698,8 +1698,8 @@ namespace isc { namespace dhcp {
 #line 1699 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 220:
-#line 848 "dhcp4_parser.yy" // lalr1.cc:907
+  case 221:
+#line 849 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr flex_id(new StringElement("flex-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(flex_id);
@@ -1707,8 +1707,8 @@ namespace isc { namespace dhcp {
 #line 1708 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 221:
-#line 853 "dhcp4_parser.yy" // lalr1.cc:907
+  case 222:
+#line 854 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hooks-libraries", l);
@@ -1718,8 +1718,8 @@ namespace isc { namespace dhcp {
 #line 1719 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 222:
-#line 858 "dhcp4_parser.yy" // lalr1.cc:907
+  case 223:
+#line 859 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1727,8 +1727,8 @@ namespace isc { namespace dhcp {
 #line 1728 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 227:
-#line 871 "dhcp4_parser.yy" // lalr1.cc:907
+  case 228:
+#line 872 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1737,8 +1737,8 @@ namespace isc { namespace dhcp {
 #line 1738 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 228:
-#line 875 "dhcp4_parser.yy" // lalr1.cc:907
+  case 229:
+#line 876 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1747,8 +1747,8 @@ namespace isc { namespace dhcp {
 #line 1748 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 229:
-#line 881 "dhcp4_parser.yy" // lalr1.cc:907
+  case 230:
+#line 882 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Parse the hooks-libraries list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1757,8 +1757,8 @@ namespace isc { namespace dhcp {
 #line 1758 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 230:
-#line 885 "dhcp4_parser.yy" // lalr1.cc:907
+  case 231:
+#line 886 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1767,16 +1767,16 @@ namespace isc { namespace dhcp {
 #line 1768 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 236:
-#line 900 "dhcp4_parser.yy" // lalr1.cc:907
+  case 237:
+#line 901 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1776 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 237:
-#line 902 "dhcp4_parser.yy" // lalr1.cc:907
+  case 238:
+#line 903 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("library", lib);
@@ -1785,16 +1785,16 @@ namespace isc { namespace dhcp {
 #line 1786 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 238:
-#line 908 "dhcp4_parser.yy" // lalr1.cc:907
+  case 239:
+#line 909 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1794 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 239:
-#line 910 "dhcp4_parser.yy" // lalr1.cc:907
+  case 240:
+#line 911 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1802,8 +1802,8 @@ namespace isc { namespace dhcp {
 #line 1803 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 240:
-#line 916 "dhcp4_parser.yy" // lalr1.cc:907
+  case 241:
+#line 917 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("expired-leases-processing", m);
@@ -1813,8 +1813,8 @@ namespace isc { namespace dhcp {
 #line 1814 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 241:
-#line 921 "dhcp4_parser.yy" // lalr1.cc:907
+  case 242:
+#line 922 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // No expired lease parameter is required
     ctx.stack_.pop_back();
@@ -1823,8 +1823,8 @@ namespace isc { namespace dhcp {
 #line 1824 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 250:
-#line 939 "dhcp4_parser.yy" // lalr1.cc:907
+  case 251:
+#line 940 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reclaim-timer-wait-time", value);
@@ -1832,8 +1832,8 @@ namespace isc { namespace dhcp {
 #line 1833 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 251:
-#line 944 "dhcp4_parser.yy" // lalr1.cc:907
+  case 252:
+#line 945 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush-reclaimed-timer-wait-time", value);
@@ -1841,8 +1841,8 @@ namespace isc { namespace dhcp {
 #line 1842 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 252:
-#line 949 "dhcp4_parser.yy" // lalr1.cc:907
+  case 253:
+#line 950 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hold-reclaimed-time", value);
@@ -1850,8 +1850,8 @@ namespace isc { namespace dhcp {
 #line 1851 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 253:
-#line 954 "dhcp4_parser.yy" // lalr1.cc:907
+  case 254:
+#line 955 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-leases", value);
@@ -1859,8 +1859,8 @@ namespace isc { namespace dhcp {
 #line 1860 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 254:
-#line 959 "dhcp4_parser.yy" // lalr1.cc:907
+  case 255:
+#line 960 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-time", value);
@@ -1868,8 +1868,8 @@ namespace isc { namespace dhcp {
 #line 1869 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 255:
-#line 964 "dhcp4_parser.yy" // lalr1.cc:907
+  case 256:
+#line 965 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("unwarned-reclaim-cycles", value);
@@ -1877,8 +1877,8 @@ namespace isc { namespace dhcp {
 #line 1878 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 256:
-#line 972 "dhcp4_parser.yy" // lalr1.cc:907
+  case 257:
+#line 973 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet4", l);
@@ -1888,8 +1888,8 @@ namespace isc { namespace dhcp {
 #line 1889 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 257:
-#line 977 "dhcp4_parser.yy" // lalr1.cc:907
+  case 258:
+#line 978 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1897,8 +1897,8 @@ namespace isc { namespace dhcp {
 #line 1898 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 262:
-#line 997 "dhcp4_parser.yy" // lalr1.cc:907
+  case 263:
+#line 998 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1907,8 +1907,8 @@ namespace isc { namespace dhcp {
 #line 1908 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 263:
-#line 1001 "dhcp4_parser.yy" // lalr1.cc:907
+  case 264:
+#line 1002 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Once we reached this place, the subnet parsing is now complete.
     // If we want to, we can implement default values here.
@@ -1933,8 +1933,8 @@ namespace isc { namespace dhcp {
 #line 1934 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 264:
-#line 1023 "dhcp4_parser.yy" // lalr1.cc:907
+  case 265:
+#line 1024 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Parse the subnet4 list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1943,8 +1943,8 @@ namespace isc { namespace dhcp {
 #line 1944 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 265:
-#line 1027 "dhcp4_parser.yy" // lalr1.cc:907
+  case 266:
+#line 1028 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The subnet subnet4 parameter is required
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1953,16 +1953,16 @@ namespace isc { namespace dhcp {
 #line 1954 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 292:
-#line 1065 "dhcp4_parser.yy" // lalr1.cc:907
+  case 293:
+#line 1066 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1962 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 293:
-#line 1067 "dhcp4_parser.yy" // lalr1.cc:907
+  case 294:
+#line 1068 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet", subnet);
@@ -1971,16 +1971,16 @@ namespace isc { namespace dhcp {
 #line 1972 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 294:
-#line 1073 "dhcp4_parser.yy" // lalr1.cc:907
+  case 295:
+#line 1074 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1980 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 295:
-#line 1075 "dhcp4_parser.yy" // lalr1.cc:907
+  case 296:
+#line 1076 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-interface", iface);
@@ -1989,16 +1989,16 @@ namespace isc { namespace dhcp {
 #line 1990 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 296:
-#line 1081 "dhcp4_parser.yy" // lalr1.cc:907
+  case 297:
+#line 1082 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1998 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 297:
-#line 1083 "dhcp4_parser.yy" // lalr1.cc:907
+  case 298:
+#line 1084 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-interface-id", iface);
@@ -2007,16 +2007,16 @@ namespace isc { namespace dhcp {
 #line 2008 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 298:
-#line 1089 "dhcp4_parser.yy" // lalr1.cc:907
+  case 299:
+#line 1090 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2016 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 299:
-#line 1091 "dhcp4_parser.yy" // lalr1.cc:907
+  case 300:
+#line 1092 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-subnet", iface);
@@ -2025,16 +2025,16 @@ namespace isc { namespace dhcp {
 #line 2026 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 300:
-#line 1097 "dhcp4_parser.yy" // lalr1.cc:907
+  case 301:
+#line 1098 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2034 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 301:
-#line 1099 "dhcp4_parser.yy" // lalr1.cc:907
+  case 302:
+#line 1100 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface", iface);
@@ -2043,16 +2043,16 @@ namespace isc { namespace dhcp {
 #line 2044 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 302:
-#line 1105 "dhcp4_parser.yy" // lalr1.cc:907
+  case 303:
+#line 1106 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2052 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 303:
-#line 1107 "dhcp4_parser.yy" // lalr1.cc:907
+  case 304:
+#line 1108 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr cls(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-class", cls);
@@ -2061,8 +2061,8 @@ namespace isc { namespace dhcp {
 #line 2062 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 304:
-#line 1113 "dhcp4_parser.yy" // lalr1.cc:907
+  case 305:
+#line 1114 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("require-client-classes", c);
@@ -2072,8 +2072,8 @@ namespace isc { namespace dhcp {
 #line 2073 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 305:
-#line 1118 "dhcp4_parser.yy" // lalr1.cc:907
+  case 306:
+#line 1119 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2081,16 +2081,16 @@ namespace isc { namespace dhcp {
 #line 2082 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 306:
-#line 1123 "dhcp4_parser.yy" // lalr1.cc:907
+  case 307:
+#line 1124 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.RESERVATION_MODE);
 }
 #line 2090 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 307:
-#line 1125 "dhcp4_parser.yy" // lalr1.cc:907
+  case 308:
+#line 1126 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2098,32 +2098,32 @@ namespace isc { namespace dhcp {
 #line 2099 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 308:
-#line 1130 "dhcp4_parser.yy" // lalr1.cc:907
+  case 309:
+#line 1131 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); }
 #line 2105 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 309:
-#line 1131 "dhcp4_parser.yy" // lalr1.cc:907
+  case 310:
+#line 1132 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); }
 #line 2111 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 310:
-#line 1132 "dhcp4_parser.yy" // lalr1.cc:907
+  case 311:
+#line 1133 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("global", ctx.loc2pos(yystack_[0].location))); }
 #line 2117 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 311:
-#line 1133 "dhcp4_parser.yy" // lalr1.cc:907
+  case 312:
+#line 1134 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); }
 #line 2123 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 312:
-#line 1136 "dhcp4_parser.yy" // lalr1.cc:907
+  case 313:
+#line 1137 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("id", id);
@@ -2131,8 +2131,8 @@ namespace isc { namespace dhcp {
 #line 2132 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 313:
-#line 1143 "dhcp4_parser.yy" // lalr1.cc:907
+  case 314:
+#line 1144 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("shared-networks", l);
@@ -2142,8 +2142,8 @@ namespace isc { namespace dhcp {
 #line 2143 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 314:
-#line 1148 "dhcp4_parser.yy" // lalr1.cc:907
+  case 315:
+#line 1149 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2151,8 +2151,8 @@ namespace isc { namespace dhcp {
 #line 2152 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 319:
-#line 1163 "dhcp4_parser.yy" // lalr1.cc:907
+  case 320:
+#line 1164 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2161,16 +2161,16 @@ namespace isc { namespace dhcp {
 #line 2162 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 320:
-#line 1167 "dhcp4_parser.yy" // lalr1.cc:907
+  case 321:
+#line 1168 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
 }
 #line 2170 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 342:
-#line 1200 "dhcp4_parser.yy" // lalr1.cc:907
+  case 343:
+#line 1201 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-def", l);
@@ -2180,8 +2180,8 @@ namespace isc { namespace dhcp {
 #line 2181 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 343:
-#line 1205 "dhcp4_parser.yy" // lalr1.cc:907
+  case 344:
+#line 1206 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2189,8 +2189,8 @@ namespace isc { namespace dhcp {
 #line 2190 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 344:
-#line 1213 "dhcp4_parser.yy" // lalr1.cc:907
+  case 345:
+#line 1214 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
@@ -2198,16 +2198,16 @@ namespace isc { namespace dhcp {
 #line 2199 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 345:
-#line 1216 "dhcp4_parser.yy" // lalr1.cc:907
+  case 346:
+#line 1217 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // parsing completed
 }
 #line 2207 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 350:
-#line 1232 "dhcp4_parser.yy" // lalr1.cc:907
+  case 351:
+#line 1233 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2216,8 +2216,8 @@ namespace isc { namespace dhcp {
 #line 2217 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 351:
-#line 1236 "dhcp4_parser.yy" // lalr1.cc:907
+  case 352:
+#line 1237 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2228,8 +2228,8 @@ namespace isc { namespace dhcp {
 #line 2229 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 352:
-#line 1247 "dhcp4_parser.yy" // lalr1.cc:907
+  case 353:
+#line 1248 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Parse the option-def list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2238,8 +2238,8 @@ namespace isc { namespace dhcp {
 #line 2239 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 353:
-#line 1251 "dhcp4_parser.yy" // lalr1.cc:907
+  case 354:
+#line 1252 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2250,8 +2250,8 @@ namespace isc { namespace dhcp {
 #line 2251 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 369:
-#line 1283 "dhcp4_parser.yy" // lalr1.cc:907
+  case 370:
+#line 1284 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("code", code);
@@ -2259,16 +2259,16 @@ namespace isc { namespace dhcp {
 #line 2260 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 371:
-#line 1290 "dhcp4_parser.yy" // lalr1.cc:907
+  case 372:
+#line 1291 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2268 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 372:
-#line 1292 "dhcp4_parser.yy" // lalr1.cc:907
+  case 373:
+#line 1293 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("type", prf);
@@ -2277,16 +2277,16 @@ namespace isc { namespace dhcp {
 #line 2278 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 373:
-#line 1298 "dhcp4_parser.yy" // lalr1.cc:907
+  case 374:
+#line 1299 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2286 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 374:
-#line 1300 "dhcp4_parser.yy" // lalr1.cc:907
+  case 375:
+#line 1301 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr rtypes(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("record-types", rtypes);
@@ -2295,16 +2295,16 @@ namespace isc { namespace dhcp {
 #line 2296 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 375:
-#line 1306 "dhcp4_parser.yy" // lalr1.cc:907
+  case 376:
+#line 1307 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2304 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 376:
-#line 1308 "dhcp4_parser.yy" // lalr1.cc:907
+  case 377:
+#line 1309 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("space", space);
@@ -2313,16 +2313,16 @@ namespace isc { namespace dhcp {
 #line 2314 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 378:
-#line 1316 "dhcp4_parser.yy" // lalr1.cc:907
+  case 379:
+#line 1317 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2322 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 379:
-#line 1318 "dhcp4_parser.yy" // lalr1.cc:907
+  case 380:
+#line 1319 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("encapsulate", encap);
@@ -2331,8 +2331,8 @@ namespace isc { namespace dhcp {
 #line 2332 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 380:
-#line 1324 "dhcp4_parser.yy" // lalr1.cc:907
+  case 381:
+#line 1325 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("array", array);
@@ -2340,8 +2340,8 @@ namespace isc { namespace dhcp {
 #line 2341 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 381:
-#line 1333 "dhcp4_parser.yy" // lalr1.cc:907
+  case 382:
+#line 1334 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-data", l);
@@ -2351,8 +2351,8 @@ namespace isc { namespace dhcp {
 #line 2352 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 382:
-#line 1338 "dhcp4_parser.yy" // lalr1.cc:907
+  case 383:
+#line 1339 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2360,8 +2360,8 @@ namespace isc { namespace dhcp {
 #line 2361 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 387:
-#line 1357 "dhcp4_parser.yy" // lalr1.cc:907
+  case 388:
+#line 1358 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2370,8 +2370,8 @@ namespace isc { namespace dhcp {
 #line 2371 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 388:
-#line 1361 "dhcp4_parser.yy" // lalr1.cc:907
+  case 389:
+#line 1362 "dhcp4_parser.yy" // lalr1.cc:907
     {
     /// @todo: the code or name parameters are required.
     ctx.stack_.pop_back();
@@ -2379,8 +2379,8 @@ namespace isc { namespace dhcp {
 #line 2380 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 389:
-#line 1369 "dhcp4_parser.yy" // lalr1.cc:907
+  case 390:
+#line 1370 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Parse the option-data list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2389,8 +2389,8 @@ namespace isc { namespace dhcp {
 #line 2390 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 390:
-#line 1373 "dhcp4_parser.yy" // lalr1.cc:907
+  case 391:
+#line 1374 "dhcp4_parser.yy" // lalr1.cc:907
     {
     /// @todo: the code or name parameters are required.
     // parsing completed
@@ -2398,16 +2398,16 @@ namespace isc { namespace dhcp {
 #line 2399 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 405:
-#line 1406 "dhcp4_parser.yy" // lalr1.cc:907
+  case 406:
+#line 1407 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2407 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 406:
-#line 1408 "dhcp4_parser.yy" // lalr1.cc:907
+  case 407:
+#line 1409 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
@@ -2416,8 +2416,8 @@ namespace isc { namespace dhcp {
 #line 2417 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 409:
-#line 1418 "dhcp4_parser.yy" // lalr1.cc:907
+  case 410:
+#line 1419 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", space);
@@ -2425,8 +2425,8 @@ namespace isc { namespace dhcp {
 #line 2426 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 410:
-#line 1423 "dhcp4_parser.yy" // lalr1.cc:907
+  case 411:
+#line 1424 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
@@ -2434,8 +2434,8 @@ namespace isc { namespace dhcp {
 #line 2435 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 411:
-#line 1431 "dhcp4_parser.yy" // lalr1.cc:907
+  case 412:
+#line 1432 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pools", l);
@@ -2445,8 +2445,8 @@ namespace isc { namespace dhcp {
 #line 2446 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 412:
-#line 1436 "dhcp4_parser.yy" // lalr1.cc:907
+  case 413:
+#line 1437 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2454,8 +2454,8 @@ namespace isc { namespace dhcp {
 #line 2455 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 417:
-#line 1451 "dhcp4_parser.yy" // lalr1.cc:907
+  case 418:
+#line 1452 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2464,8 +2464,8 @@ namespace isc { namespace dhcp {
 #line 2465 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 418:
-#line 1455 "dhcp4_parser.yy" // lalr1.cc:907
+  case 419:
+#line 1456 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2474,8 +2474,8 @@ namespace isc { namespace dhcp {
 #line 2475 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 419:
-#line 1461 "dhcp4_parser.yy" // lalr1.cc:907
+  case 420:
+#line 1462 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2484,8 +2484,8 @@ namespace isc { namespace dhcp {
 #line 2485 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 420:
-#line 1465 "dhcp4_parser.yy" // lalr1.cc:907
+  case 421:
+#line 1466 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2494,16 +2494,16 @@ namespace isc { namespace dhcp {
 #line 2495 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 430:
-#line 1484 "dhcp4_parser.yy" // lalr1.cc:907
+  case 431:
+#line 1485 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2503 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 431:
-#line 1486 "dhcp4_parser.yy" // lalr1.cc:907
+  case 432:
+#line 1487 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
@@ -2512,16 +2512,16 @@ namespace isc { namespace dhcp {
 #line 2513 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 432:
-#line 1492 "dhcp4_parser.yy" // lalr1.cc:907
+  case 433:
+#line 1493 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2521 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 433:
-#line 1494 "dhcp4_parser.yy" // lalr1.cc:907
+  case 434:
+#line 1495 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context = yystack_[0].value.as< ElementPtr > ();
@@ -2547,16 +2547,16 @@ namespace isc { namespace dhcp {
 #line 2548 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 434:
-#line 1517 "dhcp4_parser.yy" // lalr1.cc:907
+  case 435:
+#line 1518 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2556 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 435:
-#line 1519 "dhcp4_parser.yy" // lalr1.cc:907
+  case 436:
+#line 1520 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location)));
@@ -2584,8 +2584,8 @@ namespace isc { namespace dhcp {
 #line 2585 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 436:
-#line 1547 "dhcp4_parser.yy" // lalr1.cc:907
+  case 437:
+#line 1548 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations", l);
@@ -2595,8 +2595,8 @@ namespace isc { namespace dhcp {
 #line 2596 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 437:
-#line 1552 "dhcp4_parser.yy" // lalr1.cc:907
+  case 438:
+#line 1553 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2604,8 +2604,8 @@ namespace isc { namespace dhcp {
 #line 2605 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 442:
-#line 1565 "dhcp4_parser.yy" // lalr1.cc:907
+  case 443:
+#line 1566 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2614,8 +2614,8 @@ namespace isc { namespace dhcp {
 #line 2615 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 443:
-#line 1569 "dhcp4_parser.yy" // lalr1.cc:907
+  case 444:
+#line 1570 "dhcp4_parser.yy" // lalr1.cc:907
     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
@@ -2623,8 +2623,8 @@ namespace isc { namespace dhcp {
 #line 2624 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 444:
-#line 1574 "dhcp4_parser.yy" // lalr1.cc:907
+  case 445:
+#line 1575 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2633,8 +2633,8 @@ namespace isc { namespace dhcp {
 #line 2634 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 445:
-#line 1578 "dhcp4_parser.yy" // lalr1.cc:907
+  case 446:
+#line 1579 "dhcp4_parser.yy" // lalr1.cc:907
     {
     /// @todo: an identifier parameter is required.
     // parsing completed
@@ -2642,16 +2642,16 @@ namespace isc { namespace dhcp {
 #line 2643 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 465:
-#line 1609 "dhcp4_parser.yy" // lalr1.cc:907
+  case 466:
+#line 1610 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2651 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 466:
-#line 1611 "dhcp4_parser.yy" // lalr1.cc:907
+  case 467:
+#line 1612 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr next_server(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("next-server", next_server);
@@ -2660,16 +2660,16 @@ namespace isc { namespace dhcp {
 #line 2661 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 467:
-#line 1617 "dhcp4_parser.yy" // lalr1.cc:907
+  case 468:
+#line 1618 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2669 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 468:
-#line 1619 "dhcp4_parser.yy" // lalr1.cc:907
+  case 469:
+#line 1620 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr srv(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-hostname", srv);
@@ -2678,16 +2678,16 @@ namespace isc { namespace dhcp {
 #line 2679 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 469:
-#line 1625 "dhcp4_parser.yy" // lalr1.cc:907
+  case 470:
+#line 1626 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2687 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 470:
-#line 1627 "dhcp4_parser.yy" // lalr1.cc:907
+  case 471:
+#line 1628 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr bootfile(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("boot-file-name", bootfile);
@@ -2696,16 +2696,16 @@ namespace isc { namespace dhcp {
 #line 2697 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 471:
-#line 1633 "dhcp4_parser.yy" // lalr1.cc:907
+  case 472:
+#line 1634 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2705 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 472:
-#line 1635 "dhcp4_parser.yy" // lalr1.cc:907
+  case 473:
+#line 1636 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr addr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", addr);
@@ -2714,8 +2714,8 @@ namespace isc { namespace dhcp {
 #line 2715 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 473:
-#line 1641 "dhcp4_parser.yy" // lalr1.cc:907
+  case 474:
+#line 1642 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-addresses", l);
@@ -2725,8 +2725,8 @@ namespace isc { namespace dhcp {
 #line 2726 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 474:
-#line 1646 "dhcp4_parser.yy" // lalr1.cc:907
+  case 475:
+#line 1647 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2734,16 +2734,16 @@ namespace isc { namespace dhcp {
 #line 2735 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 475:
-#line 1651 "dhcp4_parser.yy" // lalr1.cc:907
+  case 476:
+#line 1652 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2743 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 476:
-#line 1653 "dhcp4_parser.yy" // lalr1.cc:907
+  case 477:
+#line 1654 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
@@ -2752,16 +2752,16 @@ namespace isc { namespace dhcp {
 #line 2753 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 477:
-#line 1659 "dhcp4_parser.yy" // lalr1.cc:907
+  case 478:
+#line 1660 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2761 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 478:
-#line 1661 "dhcp4_parser.yy" // lalr1.cc:907
+  case 479:
+#line 1662 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hw-address", hw);
@@ -2770,16 +2770,16 @@ namespace isc { namespace dhcp {
 #line 2771 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 479:
-#line 1667 "dhcp4_parser.yy" // lalr1.cc:907
+  case 480:
+#line 1668 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2779 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 480:
-#line 1669 "dhcp4_parser.yy" // lalr1.cc:907
+  case 481:
+#line 1670 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-id", hw);
@@ -2788,16 +2788,16 @@ namespace isc { namespace dhcp {
 #line 2789 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 481:
-#line 1675 "dhcp4_parser.yy" // lalr1.cc:907
+  case 482:
+#line 1676 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2797 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 482:
-#line 1677 "dhcp4_parser.yy" // lalr1.cc:907
+  case 483:
+#line 1678 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("circuit-id", hw);
@@ -2806,16 +2806,16 @@ namespace isc { namespace dhcp {
 #line 2807 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 483:
-#line 1683 "dhcp4_parser.yy" // lalr1.cc:907
+  case 484:
+#line 1684 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2815 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 484:
-#line 1685 "dhcp4_parser.yy" // lalr1.cc:907
+  case 485:
+#line 1686 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flex-id", hw);
@@ -2824,16 +2824,16 @@ namespace isc { namespace dhcp {
 #line 2825 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 485:
-#line 1691 "dhcp4_parser.yy" // lalr1.cc:907
+  case 486:
+#line 1692 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2833 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 486:
-#line 1693 "dhcp4_parser.yy" // lalr1.cc:907
+  case 487:
+#line 1694 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
@@ -2842,8 +2842,8 @@ namespace isc { namespace dhcp {
 #line 2843 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 487:
-#line 1699 "dhcp4_parser.yy" // lalr1.cc:907
+  case 488:
+#line 1700 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", c);
@@ -2853,8 +2853,8 @@ namespace isc { namespace dhcp {
 #line 2854 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 488:
-#line 1704 "dhcp4_parser.yy" // lalr1.cc:907
+  case 489:
+#line 1705 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2862,8 +2862,8 @@ namespace isc { namespace dhcp {
 #line 2863 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 489:
-#line 1712 "dhcp4_parser.yy" // lalr1.cc:907
+  case 490:
+#line 1713 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay", m);
@@ -2873,8 +2873,8 @@ namespace isc { namespace dhcp {
 #line 2874 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 490:
-#line 1717 "dhcp4_parser.yy" // lalr1.cc:907
+  case 491:
+#line 1718 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2882,8 +2882,8 @@ namespace isc { namespace dhcp {
 #line 2883 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 493:
-#line 1729 "dhcp4_parser.yy" // lalr1.cc:907
+  case 494:
+#line 1730 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", l);
@@ -2893,8 +2893,8 @@ namespace isc { namespace dhcp {
 #line 2894 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 494:
-#line 1734 "dhcp4_parser.yy" // lalr1.cc:907
+  case 495:
+#line 1735 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2902,8 +2902,8 @@ namespace isc { namespace dhcp {
 #line 2903 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 497:
-#line 1743 "dhcp4_parser.yy" // lalr1.cc:907
+  case 498:
+#line 1744 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2912,8 +2912,8 @@ namespace isc { namespace dhcp {
 #line 2913 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 498:
-#line 1747 "dhcp4_parser.yy" // lalr1.cc:907
+  case 499:
+#line 1748 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The name client class parameter is required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2922,16 +2922,16 @@ namespace isc { namespace dhcp {
 #line 2923 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 515:
-#line 1776 "dhcp4_parser.yy" // lalr1.cc:907
+  case 516:
+#line 1777 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2931 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 516:
-#line 1778 "dhcp4_parser.yy" // lalr1.cc:907
+  case 517:
+#line 1779 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
@@ -2940,8 +2940,8 @@ namespace isc { namespace dhcp {
 #line 2941 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 517:
-#line 1784 "dhcp4_parser.yy" // lalr1.cc:907
+  case 518:
+#line 1785 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("only-if-required", b);
@@ -2949,8 +2949,8 @@ namespace isc { namespace dhcp {
 #line 2950 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 518:
-#line 1793 "dhcp4_parser.yy" // lalr1.cc:907
+  case 519:
+#line 1794 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
@@ -2958,8 +2958,8 @@ namespace isc { namespace dhcp {
 #line 2959 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 519:
-#line 1800 "dhcp4_parser.yy" // lalr1.cc:907
+  case 520:
+#line 1801 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("control-socket", m);
@@ -2969,8 +2969,8 @@ namespace isc { namespace dhcp {
 #line 2970 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 520:
-#line 1805 "dhcp4_parser.yy" // lalr1.cc:907
+  case 521:
+#line 1806 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2978,16 +2978,16 @@ namespace isc { namespace dhcp {
 #line 2979 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 528:
-#line 1821 "dhcp4_parser.yy" // lalr1.cc:907
+  case 529:
+#line 1822 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2987 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 529:
-#line 1823 "dhcp4_parser.yy" // lalr1.cc:907
+  case 530:
+#line 1824 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-type", stype);
@@ -2996,16 +2996,16 @@ namespace isc { namespace dhcp {
 #line 2997 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 530:
-#line 1829 "dhcp4_parser.yy" // lalr1.cc:907
+  case 531:
+#line 1830 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3005 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 531:
-#line 1831 "dhcp4_parser.yy" // lalr1.cc:907
+  case 532:
+#line 1832 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-name", name);
@@ -3014,16 +3014,16 @@ namespace isc { namespace dhcp {
 #line 3015 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 532:
-#line 1840 "dhcp4_parser.yy" // lalr1.cc:907
+  case 533:
+#line 1841 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3023 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 533:
-#line 1842 "dhcp4_parser.yy" // lalr1.cc:907
+  case 534:
+#line 1843 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr qc = yystack_[0].value.as< ElementPtr > ();
     ctx.stack_.back()->set("dhcp-queue-control", qc);
@@ -3040,8 +3040,8 @@ namespace isc { namespace dhcp {
 #line 3041 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 534:
-#line 1858 "dhcp4_parser.yy" // lalr1.cc:907
+  case 535:
+#line 1859 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp-ddns", m);
@@ -3051,8 +3051,8 @@ namespace isc { namespace dhcp {
 #line 3052 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 535:
-#line 1863 "dhcp4_parser.yy" // lalr1.cc:907
+  case 536:
+#line 1864 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -3062,8 +3062,8 @@ namespace isc { namespace dhcp {
 #line 3063 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 536:
-#line 1870 "dhcp4_parser.yy" // lalr1.cc:907
+  case 537:
+#line 1871 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3072,8 +3072,8 @@ namespace isc { namespace dhcp {
 #line 3073 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 537:
-#line 1874 "dhcp4_parser.yy" // lalr1.cc:907
+  case 538:
+#line 1875 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -3082,8 +3082,8 @@ namespace isc { namespace dhcp {
 #line 3083 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 558:
-#line 1904 "dhcp4_parser.yy" // lalr1.cc:907
+  case 559:
+#line 1905 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
@@ -3091,16 +3091,16 @@ namespace isc { namespace dhcp {
 #line 3092 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 559:
-#line 1909 "dhcp4_parser.yy" // lalr1.cc:907
+  case 560:
+#line 1910 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3100 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 560:
-#line 1911 "dhcp4_parser.yy" // lalr1.cc:907
+  case 561:
+#line 1912 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("qualifying-suffix", s);
@@ -3109,16 +3109,16 @@ namespace isc { namespace dhcp {
 #line 3110 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 561:
-#line 1917 "dhcp4_parser.yy" // lalr1.cc:907
+  case 562:
+#line 1918 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3118 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 562:
-#line 1919 "dhcp4_parser.yy" // lalr1.cc:907
+  case 563:
+#line 1920 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-ip", s);
@@ -3127,8 +3127,8 @@ namespace isc { namespace dhcp {
 #line 3128 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 563:
-#line 1925 "dhcp4_parser.yy" // lalr1.cc:907
+  case 564:
+#line 1926 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
@@ -3136,16 +3136,16 @@ namespace isc { namespace dhcp {
 #line 3137 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 564:
-#line 1930 "dhcp4_parser.yy" // lalr1.cc:907
+  case 565:
+#line 1931 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3145 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 565:
-#line 1932 "dhcp4_parser.yy" // lalr1.cc:907
+  case 566:
+#line 1933 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-ip", s);
@@ -3154,8 +3154,8 @@ namespace isc { namespace dhcp {
 #line 3155 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 566:
-#line 1938 "dhcp4_parser.yy" // lalr1.cc:907
+  case 567:
+#line 1939 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
@@ -3163,8 +3163,8 @@ namespace isc { namespace dhcp {
 #line 3164 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 567:
-#line 1943 "dhcp4_parser.yy" // lalr1.cc:907
+  case 568:
+#line 1944 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
@@ -3172,16 +3172,16 @@ namespace isc { namespace dhcp {
 #line 3173 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 568:
-#line 1948 "dhcp4_parser.yy" // lalr1.cc:907
+  case 569:
+#line 1949 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
 #line 3181 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 569:
-#line 1950 "dhcp4_parser.yy" // lalr1.cc:907
+  case 570:
+#line 1951 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3189,28 +3189,28 @@ namespace isc { namespace dhcp {
 #line 3190 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 570:
-#line 1956 "dhcp4_parser.yy" // lalr1.cc:907
+  case 571:
+#line 1957 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
 #line 3196 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 571:
-#line 1957 "dhcp4_parser.yy" // lalr1.cc:907
+  case 572:
+#line 1958 "dhcp4_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
 #line 3202 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 572:
-#line 1960 "dhcp4_parser.yy" // lalr1.cc:907
+  case 573:
+#line 1961 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
 #line 3210 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 573:
-#line 1962 "dhcp4_parser.yy" // lalr1.cc:907
+  case 574:
+#line 1963 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
@@ -3219,8 +3219,8 @@ namespace isc { namespace dhcp {
 #line 3220 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 574:
-#line 1968 "dhcp4_parser.yy" // lalr1.cc:907
+  case 575:
+#line 1969 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-no-update", b);
@@ -3228,8 +3228,8 @@ namespace isc { namespace dhcp {
 #line 3229 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 575:
-#line 1973 "dhcp4_parser.yy" // lalr1.cc:907
+  case 576:
+#line 1974 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-client-update", b);
@@ -3237,16 +3237,16 @@ namespace isc { namespace dhcp {
 #line 3238 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 576:
-#line 1978 "dhcp4_parser.yy" // lalr1.cc:907
+  case 577:
+#line 1979 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
 #line 3246 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 577:
-#line 1980 "dhcp4_parser.yy" // lalr1.cc:907
+  case 578:
+#line 1981 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3254,40 +3254,40 @@ namespace isc { namespace dhcp {
 #line 3255 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 578:
-#line 1986 "dhcp4_parser.yy" // lalr1.cc:907
+  case 579:
+#line 1987 "dhcp4_parser.yy" // lalr1.cc:907
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3263 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 579:
-#line 1989 "dhcp4_parser.yy" // lalr1.cc:907
+  case 580:
+#line 1990 "dhcp4_parser.yy" // lalr1.cc:907
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3271 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 580:
-#line 1992 "dhcp4_parser.yy" // lalr1.cc:907
+  case 581:
+#line 1993 "dhcp4_parser.yy" // lalr1.cc:907
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3279 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 581:
-#line 1995 "dhcp4_parser.yy" // lalr1.cc:907
+  case 582:
+#line 1996 "dhcp4_parser.yy" // lalr1.cc:907
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3287 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 582:
-#line 1998 "dhcp4_parser.yy" // lalr1.cc:907
+  case 583:
+#line 1999 "dhcp4_parser.yy" // lalr1.cc:907
     {
       error(yystack_[0].location, "boolean values for the replace-client-name are "
                 "no longer supported");
@@ -3295,16 +3295,16 @@ namespace isc { namespace dhcp {
 #line 3296 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 583:
-#line 2004 "dhcp4_parser.yy" // lalr1.cc:907
+  case 584:
+#line 2005 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3304 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 584:
-#line 2006 "dhcp4_parser.yy" // lalr1.cc:907
+  case 585:
+#line 2007 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("generated-prefix", s);
@@ -3313,16 +3313,16 @@ namespace isc { namespace dhcp {
 #line 3314 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 585:
-#line 2012 "dhcp4_parser.yy" // lalr1.cc:907
+  case 586:
+#line 2013 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3322 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 586:
-#line 2014 "dhcp4_parser.yy" // lalr1.cc:907
+  case 587:
+#line 2015 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-set", s);
@@ -3331,16 +3331,16 @@ namespace isc { namespace dhcp {
 #line 3332 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 587:
-#line 2020 "dhcp4_parser.yy" // lalr1.cc:907
+  case 588:
+#line 2021 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3340 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 588:
-#line 2022 "dhcp4_parser.yy" // lalr1.cc:907
+  case 589:
+#line 2023 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-replacement", s);
@@ -3349,16 +3349,16 @@ namespace isc { namespace dhcp {
 #line 3350 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 589:
-#line 2031 "dhcp4_parser.yy" // lalr1.cc:907
+  case 590:
+#line 2032 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3358 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 590:
-#line 2033 "dhcp4_parser.yy" // lalr1.cc:907
+  case 591:
+#line 2034 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3366,16 +3366,16 @@ namespace isc { namespace dhcp {
 #line 3367 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 591:
-#line 2038 "dhcp4_parser.yy" // lalr1.cc:907
+  case 592:
+#line 2039 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3375 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 592:
-#line 2040 "dhcp4_parser.yy" // lalr1.cc:907
+  case 593:
+#line 2041 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3383,16 +3383,16 @@ namespace isc { namespace dhcp {
 #line 3384 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 593:
-#line 2045 "dhcp4_parser.yy" // lalr1.cc:907
+  case 594:
+#line 2046 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3392 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 594:
-#line 2047 "dhcp4_parser.yy" // lalr1.cc:907
+  case 595:
+#line 2048 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("Control-agent", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3400,8 +3400,8 @@ namespace isc { namespace dhcp {
 #line 3401 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 595:
-#line 2052 "dhcp4_parser.yy" // lalr1.cc:907
+  case 596:
+#line 2053 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3410,16 +3410,16 @@ namespace isc { namespace dhcp {
 #line 3411 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 596:
-#line 2056 "dhcp4_parser.yy" // lalr1.cc:907
+  case 597:
+#line 2057 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
 }
 #line 3419 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 597:
-#line 2061 "dhcp4_parser.yy" // lalr1.cc:907
+  case 598:
+#line 2062 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-control", i);
@@ -3429,8 +3429,8 @@ namespace isc { namespace dhcp {
 #line 3430 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 598:
-#line 2066 "dhcp4_parser.yy" // lalr1.cc:907
+  case 599:
+#line 2067 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // No config control params are required
     ctx.stack_.pop_back();
@@ -3439,8 +3439,8 @@ namespace isc { namespace dhcp {
 #line 3440 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 599:
-#line 2072 "dhcp4_parser.yy" // lalr1.cc:907
+  case 600:
+#line 2073 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Parse the config-control map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3449,8 +3449,8 @@ namespace isc { namespace dhcp {
 #line 3450 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 600:
-#line 2076 "dhcp4_parser.yy" // lalr1.cc:907
+  case 601:
+#line 2077 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // No config_control params are required
     // parsing completed
@@ -3458,8 +3458,8 @@ namespace isc { namespace dhcp {
 #line 3459 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 605:
-#line 2091 "dhcp4_parser.yy" // lalr1.cc:907
+  case 606:
+#line 2092 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-databases", l);
@@ -3469,8 +3469,8 @@ namespace isc { namespace dhcp {
 #line 3470 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 606:
-#line 2096 "dhcp4_parser.yy" // lalr1.cc:907
+  case 607:
+#line 2097 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3478,8 +3478,8 @@ namespace isc { namespace dhcp {
 #line 3479 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 607:
-#line 2106 "dhcp4_parser.yy" // lalr1.cc:907
+  case 608:
+#line 2107 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("Logging", m);
@@ -3489,8 +3489,8 @@ namespace isc { namespace dhcp {
 #line 3490 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 608:
-#line 2111 "dhcp4_parser.yy" // lalr1.cc:907
+  case 609:
+#line 2112 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3498,8 +3498,8 @@ namespace isc { namespace dhcp {
 #line 3499 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 609:
-#line 2116 "dhcp4_parser.yy" // lalr1.cc:907
+  case 610:
+#line 2117 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // Parse the Logging map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3508,16 +3508,16 @@ namespace isc { namespace dhcp {
 #line 3509 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 610:
-#line 2120 "dhcp4_parser.yy" // lalr1.cc:907
+  case 611:
+#line 2121 "dhcp4_parser.yy" // lalr1.cc:907
     {
     // parsing completed
 }
 #line 3517 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 614:
-#line 2136 "dhcp4_parser.yy" // lalr1.cc:907
+  case 615:
+#line 2137 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("loggers", l);
@@ -3527,8 +3527,8 @@ namespace isc { namespace dhcp {
 #line 3528 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 615:
-#line 2141 "dhcp4_parser.yy" // lalr1.cc:907
+  case 616:
+#line 2142 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3536,8 +3536,8 @@ namespace isc { namespace dhcp {
 #line 3537 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 618:
-#line 2153 "dhcp4_parser.yy" // lalr1.cc:907
+  case 619:
+#line 2154 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
@@ -3546,16 +3546,16 @@ namespace isc { namespace dhcp {
 #line 3547 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 619:
-#line 2157 "dhcp4_parser.yy" // lalr1.cc:907
+  case 620:
+#line 2158 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
 }
 #line 3555 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 629:
-#line 2174 "dhcp4_parser.yy" // lalr1.cc:907
+  case 630:
+#line 2175 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
@@ -3563,16 +3563,16 @@ namespace isc { namespace dhcp {
 #line 3564 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 630:
-#line 2179 "dhcp4_parser.yy" // lalr1.cc:907
+  case 631:
+#line 2180 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3572 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 631:
-#line 2181 "dhcp4_parser.yy" // lalr1.cc:907
+  case 632:
+#line 2182 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
@@ -3581,8 +3581,8 @@ namespace isc { namespace dhcp {
 #line 3582 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 632:
-#line 2187 "dhcp4_parser.yy" // lalr1.cc:907
+  case 633:
+#line 2188 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
@@ -3592,8 +3592,8 @@ namespace isc { namespace dhcp {
 #line 3593 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 633:
-#line 2192 "dhcp4_parser.yy" // lalr1.cc:907
+  case 634:
+#line 2193 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3601,8 +3601,8 @@ namespace isc { namespace dhcp {
 #line 3602 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 636:
-#line 2201 "dhcp4_parser.yy" // lalr1.cc:907
+  case 637:
+#line 2202 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3611,24 +3611,24 @@ namespace isc { namespace dhcp {
 #line 3612 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 637:
-#line 2205 "dhcp4_parser.yy" // lalr1.cc:907
+  case 638:
+#line 2206 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
 }
 #line 3620 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 644:
-#line 2219 "dhcp4_parser.yy" // lalr1.cc:907
+  case 645:
+#line 2220 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3628 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 645:
-#line 2221 "dhcp4_parser.yy" // lalr1.cc:907
+  case 646:
+#line 2222 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
@@ -3637,8 +3637,8 @@ namespace isc { namespace dhcp {
 #line 3638 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 646:
-#line 2227 "dhcp4_parser.yy" // lalr1.cc:907
+  case 647:
+#line 2228 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
@@ -3646,8 +3646,8 @@ namespace isc { namespace dhcp {
 #line 3647 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 647:
-#line 2232 "dhcp4_parser.yy" // lalr1.cc:907
+  case 648:
+#line 2233 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
@@ -3655,8 +3655,8 @@ namespace isc { namespace dhcp {
 #line 3656 "dhcp4_parser.cc" // lalr1.cc:907
     break;
 
-  case 648:
-#line 2237 "dhcp4_parser.yy" // lalr1.cc:907
+  case 649:
+#line 2238 "dhcp4_parser.yy" // lalr1.cc:907
     {
     ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
@@ -3923,118 +3923,118 @@ namespace isc { namespace dhcp {
   }
 
 
-  const short Dhcp4Parser::yypact_ninf_ = -808;
+  const short Dhcp4Parser::yypact_ninf_ = -796;
 
   const signed char Dhcp4Parser::yytable_ninf_ = -1;
 
   const short
   Dhcp4Parser::yypact_[] =
   {
-     453,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,    40,    27,    51,    53,    59,
-      71,    73,    75,    79,    89,   128,   137,   147,   154,   156,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,    27,    47,
-      23,    63,    54,   178,   -24,   186,   158,   245,    36,     5,
-     465,    87,    37,  -808,   224,   233,   249,   236,   258,  -808,
-    -808,  -808,  -808,  -808,   285,  -808,    76,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,   304,   306,   323,
-    -808,  -808,  -808,  -808,  -808,  -808,   324,   335,   336,   345,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,   348,  -808,  -808,  -808,  -808,   119,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,   359,  -808,   134,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-     360,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,   135,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,   145,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,   256,   265,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,   354,  -808,  -808,
-     375,  -808,  -808,  -808,   385,  -808,  -808,   368,   388,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,   389,   392,  -808,  -808,  -808,  -808,   393,   399,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,   148,  -808,  -808,  -808,   400,  -808,  -808,   401,
-    -808,   404,   408,  -808,  -808,   411,   412,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,   161,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,   182,  -808,  -808,  -808,  -808,   215,  -808,  -808,
-    -808,    27,    27,  -808,   253,   417,   418,   420,   421,   422,
-    -808,    23,  -808,    37,   429,   431,   432,   270,   274,   275,
-     440,   441,   442,   443,   444,   446,   286,   287,   288,   289,
-     447,   455,   456,   458,   459,   460,   461,   464,   466,   467,
-     468,   469,   303,   470,   471,   472,    63,  -808,   473,   474,
-     477,   318,    54,  -808,   479,   481,   483,   484,   485,   486,
-     326,   489,   491,   492,   493,   178,  -808,   494,   -24,  -808,
-     495,   496,   497,   499,   500,   501,   502,   503,  -808,   186,
-    -808,   504,   506,   346,   507,   509,   510,   347,  -808,   245,
-     513,   351,   352,  -808,    36,   519,   520,    20,  -808,   357,
-     522,   523,   363,   526,   365,   366,   529,   530,   367,   370,
-     532,   539,   540,   541,   465,  -808,   542,    87,  -808,   543,
-      37,  -808,  -808,  -808,   544,   545,   546,    27,    27,    27,
-    -808,   218,   547,   548,   550,  -808,  -808,  -808,   394,   395,
-     396,   551,   555,   558,  -808,  -808,  -808,  -808,   402,   559,
-     560,   561,   564,   563,   406,   567,   568,   569,   570,   571,
-    -808,   573,   563,   574,  -808,   577,   170,   231,  -808,  -808,
-     433,   434,   435,   591,   436,   454,  -808,   114,   577,   457,
-     590,  -808,   462,  -808,   577,   463,   475,   476,   478,   480,
-     482,   487,  -808,   488,   490,  -808,   498,   505,   508,  -808,
-    -808,   511,  -808,  -808,  -808,   512,    27,  -808,  -808,   514,
-     515,  -808,   516,  -808,  -808,    21,   517,  -808,  -808,    48,
-     518,   521,   524,  -808,   613,  -808,   615,  -808,    27,    63,
-      87,  -808,  -808,  -808,  -808,    37,    54,   527,  -808,  -808,
-    -808,   255,   255,   614,  -808,   616,   617,   618,   619,  -808,
-    -808,  -808,   260,   622,   624,   625,   227,    52,  -808,   465,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,   626,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,   230,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,   627,   614,  -808,   226,   239,
-     240,   257,  -808,   264,  -808,  -808,  -808,  -808,  -808,  -808,
-     572,   631,   632,   633,   634,  -808,  -808,   635,   638,   640,
-     642,   644,  -808,   282,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,   284,  -808,   645,   647,  -808,  -808,   648,   653,
-    -808,  -808,   651,   655,  -808,  -808,   654,   656,  -808,  -808,
-     658,   659,  -808,  -808,  -808,  -808,  -808,  -808,    56,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,   104,  -808,  -808,   660,
-     662,  -808,  -808,   661,   665,  -808,   657,   667,   668,   670,
-     671,   674,   315,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,   317,  -808,  -808,  -808,   321,
-     525,  -808,   663,   679,  -808,  -808,  -808,  -808,   676,  -808,
-     108,  -808,   681,  -808,  -808,  -808,  -808,   684,   527,  -808,
-     687,   688,   689,   690,   531,   528,   533,   534,   535,   691,
-     694,   537,   538,   549,   552,   553,   255,  -808,  -808,   255,
-    -808,   614,   178,  -808,   616,   245,  -808,   617,    36,  -808,
-     618,   403,  -808,   619,   260,  -808,    70,   622,  -808,   186,
-    -808,   624,     5,  -808,   625,   554,   556,   557,   562,   565,
-     566,   227,  -808,   696,   701,    52,  -808,  -808,  -808,   700,
-     682,   -24,  -808,   626,   703,  -808,    81,   627,  -808,  -808,
-     575,  -808,   174,   576,   578,   579,  -808,  -808,  -808,  -808,
-    -808,   580,   582,  -808,  -808,  -808,  -808,  -808,  -808,   338,
-    -808,   339,  -808,   702,  -808,   704,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,   358,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,   705,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,   706,   708,  -808,  -808,  -808,  -808,  -808,   709,  -808,
-     362,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,   583,
-     585,  -808,  -808,   586,   372,  -808,   577,  -808,   712,  -808,
-    -808,  -808,  -808,  -808,   374,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,   403,  -808,   715,   588,  -808,
-      70,  -808,  -808,  -808,  -808,  -808,  -808,  -808,   720,   587,
-     721,    81,  -808,  -808,   589,  -808,  -808,   722,  -808,   592,
-    -808,  -808,   719,  -808,  -808,   171,  -808,   129,   719,  -808,
-    -808,   725,   726,   729,   384,  -808,  -808,  -808,  -808,  -808,
-    -808,   730,   597,   593,   594,   129,  -808,   612,  -808,  -808,
-    -808,  -808,  -808
+     343,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,    50,    35,    56,    62,    64,
+     110,   129,   151,   183,   191,   222,   224,   228,   243,   262,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,    35,    95,
+      18,    69,    43,   167,   148,   188,   205,    77,   111,   -56,
+     463,   147,    41,  -796,   295,   290,   300,   303,   309,  -796,
+    -796,  -796,  -796,  -796,   319,  -796,    57,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,   323,   325,   337,
+    -796,  -796,  -796,  -796,  -796,  -796,   348,   357,   359,   362,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,   363,  -796,  -796,  -796,  -796,    59,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,   364,  -796,    70,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,   367,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,    76,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,   125,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,   366,   373,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,   370,  -796,
+    -796,   378,  -796,  -796,  -796,   380,  -796,  -796,   377,   383,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,   385,   386,  -796,  -796,  -796,  -796,   379,
+     390,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,   126,  -796,  -796,  -796,   392,  -796,  -796,
+     394,  -796,   395,   398,  -796,  -796,   399,   403,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,   127,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,   181,  -796,  -796,  -796,  -796,   201,  -796,
+    -796,  -796,    35,    35,  -796,   166,   408,   411,   412,   413,
+     414,  -796,    18,  -796,    41,   417,   418,   421,   226,   261,
+     268,   426,   433,   435,   436,   437,   438,   277,   278,   279,
+     280,   443,   445,   446,   447,   464,   466,   469,   470,   471,
+     472,   473,   474,   476,   315,   478,   479,   480,    69,  -796,
+     481,   482,   483,   320,    43,  -796,   485,   486,   487,   488,
+     504,   505,   346,   509,   510,   511,   167,  -796,   512,   148,
+    -796,   514,   515,   516,   517,   520,   521,   522,   523,  -796,
+     188,  -796,   524,   525,   365,   528,   530,   531,   368,  -796,
+      77,   533,   374,   376,  -796,   111,   534,   537,   -72,  -796,
+     381,   542,   543,   384,   547,   387,   388,   548,   551,   389,
+     391,   556,   557,   558,   559,   463,  -796,   560,   147,  -796,
+     561,    41,  -796,  -796,  -796,   562,   563,   564,    35,    35,
+      35,  -796,   202,   565,   566,   568,  -796,  -796,  -796,   402,
+     404,   429,   570,   571,   574,  -796,  -796,  -796,  -796,   430,
+     591,   592,   593,   594,   595,   439,   195,   598,   600,   601,
+     602,   603,  -796,   604,   595,   605,  -796,   608,   153,   234,
+    -796,  -796,   444,   449,   450,   611,   452,   453,  -796,   608,
+     454,   613,  -796,   456,  -796,   608,   457,   458,   459,   460,
+     461,   462,   465,  -796,   467,   468,  -796,   475,   477,   484,
+    -796,  -796,   489,  -796,  -796,  -796,   490,    35,  -796,  -796,
+     491,   492,  -796,   493,  -796,  -796,    29,   497,  -796,  -796,
+     -28,   494,   495,   496,  -796,   626,  -796,   629,  -796,    35,
+      69,   147,  -796,  -796,  -796,  -796,    41,    43,   545,  -796,
+    -796,  -796,   415,   415,   628,  -796,   630,   631,   632,   634,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,   244,   636,
+     637,   638,   208,    -2,  -796,   463,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,   639,  -796,  -796,
+    -796,  -796,    72,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,   640,   628,  -796,   204,
+     210,   211,   229,  -796,   230,  -796,  -796,  -796,  -796,  -796,
+    -796,   644,   646,   647,   648,   649,  -796,  -796,   658,   659,
+     660,   661,   662,  -796,   253,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,   254,  -796,   663,   633,  -796,  -796,   664,
+     665,  -796,  -796,   666,   668,  -796,  -796,   667,   671,  -796,
+    -796,   669,   673,  -796,  -796,  -796,  -796,  -796,  -796,    83,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,    84,  -796,  -796,
+     672,   674,  -796,  -796,   675,   676,  -796,   678,   679,   680,
+     681,   682,   683,   260,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,   286,  -796,  -796,  -796,
+     287,   502,  -796,   684,   677,  -796,  -796,  -796,  -796,   685,
+    -796,   115,  -796,   686,  -796,  -796,  -796,  -796,   687,   545,
+    -796,   690,   691,   692,   693,   442,   532,   535,   536,   539,
+     694,   695,   540,   541,   544,   546,   549,   415,  -796,  -796,
+     415,  -796,   628,   167,  -796,   630,    77,  -796,   631,   111,
+    -796,   632,   245,  -796,   634,   244,  -796,    75,   636,  -796,
+     188,  -796,   637,   -56,  -796,   638,   550,   552,   553,   554,
+     555,   567,   208,  -796,   698,   699,    -2,  -796,  -796,  -796,
+     702,   706,   148,  -796,   639,   707,  -796,   328,   640,  -796,
+    -796,   569,  -796,   321,   572,   573,   575,  -796,  -796,  -796,
+    -796,  -796,   576,   577,  -796,  -796,  -796,  -796,  -796,  -796,
+     288,  -796,   294,  -796,   705,  -796,   714,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+     302,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,   710,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,   715,   712,  -796,  -796,  -796,  -796,  -796,   716,
+    -796,   317,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+     578,   579,  -796,  -796,   580,   327,  -796,   608,  -796,   721,
+    -796,  -796,  -796,  -796,  -796,   340,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,   245,  -796,   722,   581,
+    -796,    75,  -796,  -796,  -796,  -796,  -796,  -796,  -796,   723,
+     582,   724,   328,  -796,  -796,   586,  -796,  -796,   725,  -796,
+     587,  -796,  -796,   728,  -796,  -796,   156,  -796,   -31,   728,
+    -796,  -796,   727,   732,   735,   342,  -796,  -796,  -796,  -796,
+    -796,  -796,   742,   589,   588,   612,   -31,  -796,   590,  -796,
+    -796,  -796,  -796,  -796
   };
 
   const unsigned short
@@ -4044,150 +4044,150 @@ namespace isc { namespace dhcp {
       20,    22,    24,    26,    28,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        1,    45,    38,    34,    33,    30,    31,    32,    37,     3,
-      35,    36,    58,     5,    70,     7,   127,     9,   264,    11,
-     419,    13,   444,    15,   344,    17,   352,    19,   389,    21,
-     229,    23,   536,    25,   609,    27,   599,    29,    47,    41,
-       0,     0,     0,     0,     0,   446,     0,   354,   391,     0,
+      35,    36,    58,     5,    70,     7,   128,     9,   265,    11,
+     420,    13,   445,    15,   345,    17,   353,    19,   390,    21,
+     230,    23,   537,    25,   610,    27,   600,    29,    47,    41,
+       0,     0,     0,     0,     0,   447,     0,   355,   392,     0,
        0,     0,     0,    49,     0,    48,     0,     0,    42,    68,
-     607,   589,   591,   593,     0,    67,     0,    60,    62,    64,
-      65,    66,    63,   595,   597,   116,   142,     0,     0,     0,
-     465,   467,   469,   140,   149,   151,     0,     0,     0,     0,
-     111,   256,   342,   381,   313,   432,   434,   207,   493,   436,
-     221,   240,     0,   519,   532,   534,   106,     0,    72,    74,
-      75,    76,    77,   105,    94,    95,    96,    80,    81,   102,
-      82,    83,    84,    88,    89,    78,    79,    86,    87,   100,
-     101,   103,    97,    98,    99,    85,    90,    91,    92,    93,
-     104,   129,   131,   135,     0,   126,     0,   118,   120,   121,
-     122,   123,   124,   125,   294,   296,   298,   411,   292,   300,
-       0,   306,   304,   302,   489,   291,   268,   269,   270,   281,
-     282,     0,   266,   273,   286,   287,   288,   274,   276,   277,
-     279,   275,   271,   272,   289,   290,   278,   283,   284,   285,
-     280,   430,   429,   425,   426,   424,     0,   421,   423,   427,
-     428,   487,   475,   477,   481,   479,   485,   483,   471,   464,
-     458,   462,   463,     0,   447,   448,   459,   460,   461,   455,
-     450,   456,   452,   453,   454,   457,   451,     0,   371,   192,
-       0,   375,   373,   378,     0,   367,   368,     0,   355,   356,
-     358,   370,   359,   360,   361,   377,   362,   363,   364,   365,
-     366,   405,     0,     0,   403,   404,   407,   408,     0,   392,
-     393,   395,   396,   397,   398,   399,   400,   401,   402,   236,
-     238,   233,     0,   231,   234,   235,     0,   559,   561,     0,
-     564,     0,     0,   568,   572,     0,     0,   576,   583,   585,
-     587,   557,   555,   556,     0,   538,   540,   541,   542,   543,
+     608,   590,   592,   594,     0,    67,     0,    60,    62,    64,
+      65,    66,    63,   596,   598,   117,   143,     0,     0,     0,
+     466,   468,   470,   141,   150,   152,     0,     0,     0,     0,
+     112,   257,   343,   382,   314,   433,   435,   307,   208,   494,
+     437,   222,   241,     0,   520,   533,   535,   107,     0,    72,
+      74,    75,    76,    77,   105,    94,    95,    96,    80,    81,
+     102,    82,    83,    84,    88,    89,    78,   106,    79,    86,
+      87,   100,   101,   103,    97,    98,    99,    85,    90,    91,
+      92,    93,   104,   130,   132,   136,     0,   127,     0,   119,
+     121,   122,   123,   124,   125,   126,   295,   297,   299,   412,
+     293,   301,     0,   305,   303,   490,   292,   269,   270,   271,
+     282,   283,     0,   267,   274,   287,   288,   289,   275,   277,
+     278,   280,   276,   272,   273,   290,   291,   279,   284,   285,
+     286,   281,   431,   430,   426,   427,   425,     0,   422,   424,
+     428,   429,   488,   476,   478,   482,   480,   486,   484,   472,
+     465,   459,   463,   464,     0,   448,   449,   460,   461,   462,
+     456,   451,   457,   453,   454,   455,   458,   452,     0,   372,
+     193,     0,   376,   374,   379,     0,   368,   369,     0,   356,
+     357,   359,   371,   360,   361,   362,   378,   363,   364,   365,
+     366,   367,   406,     0,     0,   404,   405,   408,   409,     0,
+     393,   394,   396,   397,   398,   399,   400,   401,   402,   403,
+     237,   239,   234,     0,   232,   235,   236,     0,   560,   562,
+       0,   565,     0,     0,   569,   573,     0,     0,   577,   584,
+     586,   588,   558,   556,   557,     0,   539,   541,   542,   543,
      544,   545,   546,   547,   548,   549,   550,   551,   552,   553,
-     554,   614,     0,   611,   613,   605,   604,     0,   601,   603,
-      46,     0,     0,    39,     0,     0,     0,     0,     0,     0,
-      57,     0,    59,     0,     0,     0,     0,     0,     0,     0,
+     554,   555,   615,     0,   612,   614,   606,   605,     0,   602,
+     604,    46,     0,     0,    39,     0,     0,     0,     0,     0,
+       0,    57,     0,    59,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    71,     0,     0,
-       0,     0,     0,   128,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   265,     0,     0,   420,
-       0,     0,     0,     0,     0,     0,     0,     0,   445,     0,
-     345,     0,     0,     0,     0,     0,     0,     0,   353,     0,
-       0,     0,     0,   390,     0,     0,     0,     0,   230,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    71,
+       0,     0,     0,     0,     0,   129,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   266,     0,     0,
+     421,     0,     0,     0,     0,     0,     0,     0,     0,   446,
+       0,   346,     0,     0,     0,     0,     0,     0,     0,   354,
+       0,     0,     0,     0,   391,     0,     0,     0,     0,   231,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   537,     0,     0,   610,     0,
-       0,   600,    50,    43,     0,     0,     0,     0,     0,     0,
-      61,     0,     0,     0,     0,   113,   114,   115,     0,     0,
-       0,     0,     0,     0,   107,   108,   109,   110,     0,     0,
+       0,     0,     0,     0,     0,     0,   538,     0,     0,   611,
+       0,     0,   601,    50,    43,     0,     0,     0,     0,     0,
+       0,    61,     0,     0,     0,     0,   114,   115,   116,     0,
+       0,     0,     0,     0,     0,   108,   109,   110,   111,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     518,     0,     0,     0,    73,     0,     0,     0,   139,   119,
-       0,     0,     0,     0,     0,     0,   312,     0,     0,     0,
-       0,   267,     0,   422,     0,     0,     0,     0,     0,     0,
-       0,     0,   449,     0,     0,   369,     0,     0,     0,   380,
-     357,     0,   409,   410,   394,     0,     0,   232,   558,     0,
-       0,   563,     0,   566,   567,     0,     0,   574,   575,     0,
-       0,     0,     0,   539,     0,   612,     0,   602,     0,     0,
-       0,   590,   592,   594,   596,     0,     0,     0,   466,   468,
-     470,     0,     0,   153,   112,   258,   346,   383,   315,    40,
-     433,   435,     0,     0,   438,   223,     0,     0,   533,     0,
-      51,   130,   133,   134,   132,   137,   138,   136,   295,   297,
-     299,   413,   293,   301,   308,   309,   310,   311,   307,   305,
-     303,     0,   431,   488,   476,   478,   482,   480,   486,   484,
-     472,   372,   193,   376,   374,   379,   406,   237,   239,   560,
-     562,   565,   570,   571,   569,   573,   578,   579,   580,   581,
-     582,   577,   584,   586,   588,     0,   153,    44,     0,     0,
-       0,     0,   147,     0,   144,   146,   179,   185,   187,   189,
-       0,     0,     0,     0,     0,   201,   203,     0,     0,     0,
-       0,     0,   178,     0,   159,   161,   162,   163,   164,   165,
-     166,   167,   168,   169,   170,   174,   175,   176,   171,   177,
-     172,   173,     0,   157,     0,   154,   155,   262,     0,   259,
-     260,   350,     0,   347,   348,   387,     0,   384,   385,   319,
-       0,   316,   317,   216,   217,   218,   219,   220,     0,   209,
-     211,   212,   213,   214,   215,   497,     0,   495,   442,     0,
-     439,   440,   227,     0,   224,   225,     0,     0,     0,     0,
-       0,     0,     0,   242,   244,   245,   246,   247,   248,   249,
-     528,   530,   527,   525,   526,     0,   521,   523,   524,     0,
-      53,   417,     0,   414,   415,   473,   491,   492,     0,   618,
-       0,   616,     0,    69,   608,   598,   117,     0,     0,   143,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   141,   150,     0,
-     152,     0,     0,   257,     0,   354,   343,     0,   391,   382,
-       0,     0,   314,     0,     0,   208,   499,     0,   494,   446,
-     437,     0,     0,   222,     0,     0,     0,     0,     0,     0,
-       0,     0,   241,     0,     0,     0,   520,   535,    55,     0,
-      54,     0,   412,     0,     0,   490,     0,     0,   615,   606,
-       0,   145,     0,     0,     0,     0,   191,   194,   195,   196,
-     197,     0,     0,   205,   206,   198,   199,   200,   160,     0,
-     156,     0,   261,     0,   349,     0,   386,   341,   338,   326,
-     327,   329,   330,   323,   324,   325,   336,   337,   335,     0,
-     321,   328,   339,   340,   331,   332,   333,   334,   318,   210,
-     515,     0,   513,   514,   506,   507,   511,   512,   508,   509,
-     510,     0,   500,   501,   503,   504,   505,   496,     0,   441,
-       0,   226,   250,   251,   252,   253,   254,   255,   243,     0,
-       0,   522,    52,     0,     0,   416,     0,   632,     0,   630,
-     628,   622,   626,   627,     0,   620,   624,   625,   623,   617,
-     148,   181,   182,   183,   184,   180,   186,   188,   190,   202,
-     204,   158,   263,   351,   388,     0,   320,     0,     0,   498,
-       0,   443,   228,   529,   531,    56,   418,   474,     0,     0,
-       0,     0,   619,   322,     0,   517,   502,     0,   629,     0,
-     621,   516,     0,   631,   636,     0,   634,     0,     0,   633,
-     644,     0,     0,     0,     0,   638,   640,   641,   642,   643,
-     635,     0,     0,     0,     0,     0,   637,     0,   646,   647,
-     648,   639,   645
+       0,     0,   519,     0,     0,     0,    73,     0,     0,     0,
+     140,   120,     0,     0,     0,     0,     0,     0,   313,     0,
+       0,     0,   268,     0,   423,     0,     0,     0,     0,     0,
+       0,     0,     0,   450,     0,     0,   370,     0,     0,     0,
+     381,   358,     0,   410,   411,   395,     0,     0,   233,   559,
+       0,     0,   564,     0,   567,   568,     0,     0,   575,   576,
+       0,     0,     0,     0,   540,     0,   613,     0,   603,     0,
+       0,     0,   591,   593,   595,   597,     0,     0,     0,   467,
+     469,   471,     0,     0,   154,   113,   259,   347,   384,   316,
+      40,   434,   436,   309,   310,   311,   312,   308,     0,     0,
+     439,   224,     0,     0,   534,     0,    51,   131,   134,   135,
+     133,   138,   139,   137,   296,   298,   300,   414,   294,   302,
+     306,   304,     0,   432,   489,   477,   479,   483,   481,   487,
+     485,   473,   373,   194,   377,   375,   380,   407,   238,   240,
+     561,   563,   566,   571,   572,   570,   574,   579,   580,   581,
+     582,   583,   578,   585,   587,   589,     0,   154,    44,     0,
+       0,     0,     0,   148,     0,   145,   147,   180,   186,   188,
+     190,     0,     0,     0,     0,     0,   202,   204,     0,     0,
+       0,     0,     0,   179,     0,   160,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   175,   176,   177,   172,
+     178,   173,   174,     0,   158,     0,   155,   156,   263,     0,
+     260,   261,   351,     0,   348,   349,   388,     0,   385,   386,
+     320,     0,   317,   318,   217,   218,   219,   220,   221,     0,
+     210,   212,   213,   214,   215,   216,   498,     0,   496,   443,
+       0,   440,   441,   228,     0,   225,   226,     0,     0,     0,
+       0,     0,     0,     0,   243,   245,   246,   247,   248,   249,
+     250,   529,   531,   528,   526,   527,     0,   522,   524,   525,
+       0,    53,   418,     0,   415,   416,   474,   492,   493,     0,
+     619,     0,   617,     0,    69,   609,   599,   118,     0,     0,
+     144,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   142,   151,
+       0,   153,     0,     0,   258,     0,   355,   344,     0,   392,
+     383,     0,     0,   315,     0,     0,   209,   500,     0,   495,
+     447,   438,     0,     0,   223,     0,     0,     0,     0,     0,
+       0,     0,     0,   242,     0,     0,     0,   521,   536,    55,
+       0,    54,     0,   413,     0,     0,   491,     0,     0,   616,
+     607,     0,   146,     0,     0,     0,     0,   192,   195,   196,
+     197,   198,     0,     0,   206,   207,   199,   200,   201,   161,
+       0,   157,     0,   262,     0,   350,     0,   387,   342,   339,
+     327,   328,   330,   331,   324,   325,   326,   337,   338,   336,
+       0,   322,   329,   340,   341,   332,   333,   334,   335,   319,
+     211,   516,     0,   514,   515,   507,   508,   512,   513,   509,
+     510,   511,     0,   501,   502,   504,   505,   506,   497,     0,
+     442,     0,   227,   251,   252,   253,   254,   255,   256,   244,
+       0,     0,   523,    52,     0,     0,   417,     0,   633,     0,
+     631,   629,   623,   627,   628,     0,   621,   625,   626,   624,
+     618,   149,   182,   183,   184,   185,   181,   187,   189,   191,
+     203,   205,   159,   264,   352,   389,     0,   321,     0,     0,
+     499,     0,   444,   229,   530,   532,    56,   419,   475,     0,
+       0,     0,     0,   620,   323,     0,   518,   503,     0,   630,
+       0,   622,   517,     0,   632,   637,     0,   635,     0,     0,
+     634,   645,     0,     0,     0,     0,   639,   641,   642,   643,
+     644,   636,     0,     0,     0,     0,     0,   638,     0,   647,
+     648,   649,   640,   646
   };
 
   const short
   Dhcp4Parser::yypgoto_[] =
   {
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,   -38,  -808,  -397,  -808,
-     196,  -808,  -808,  -808,  -808,  -808,  -808,  -507,  -808,  -808,
-    -808,   -70,  -808,  -808,  -808,   376,  -808,  -808,  -808,  -808,
-     157,   342,   -48,   -47,   -32,  -808,  -808,  -808,  -808,    -8,
-       4,  -808,  -808,   127,   333,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,   -59,  -808,  -808,  -808,  -808,  -808,  -808,   120,  -808,
-     -79,  -808,  -579,   -28,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,   -49,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,   -45,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,   -50,  -808,  -808,  -808,   -40,   353,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,   -46,  -808,  -808,  -808,  -808,
-    -808,  -808,  -807,  -808,  -808,  -808,   -17,  -808,  -808,  -808,
-     -10,   407,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -796,  -808,   -68,  -808,   -20,  -808,  -794,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,    -5,  -808,  -808,  -170,   -65,  -808,
-    -808,  -808,  -808,  -808,   -11,  -808,  -808,  -808,     7,  -808,
-     409,  -808,   -66,  -808,  -808,  -808,  -808,  -808,   -60,  -808,
-    -808,  -808,  -808,  -808,   -18,  -808,  -808,  -808,     3,  -808,
-    -808,  -808,    10,  -808,   398,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,   -23,  -808,  -808,  -808,
-     -16,   428,  -808,  -808,   -58,  -808,   -30,  -808,   -42,  -808,
-    -808,  -808,     9,  -808,  -808,  -808,    12,  -808,   423,   -12,
-    -808,    -2,  -808,     8,  -808,   222,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -785,  -808,  -808,  -808,  -808,  -808,    17,
-    -808,  -808,  -808,  -141,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,     0,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,   247,   397,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,  -808,
-    -808,  -808,  -340,   387,  -808,  -808,  -808,  -808,  -808,  -808,
-     278,   405,  -808,  -808,  -808,    -7,  -808,  -808,  -142,  -808,
-    -808,  -808,  -808,  -808,  -808,  -156,  -808,  -808,  -172,  -808,
-    -808,  -808,  -808,  -808
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,   -46,  -796,  -455,  -796,
+     174,  -796,  -796,  -796,  -796,  -796,  -796,  -505,  -796,  -796,
+    -796,   -70,  -796,  -796,  -796,   396,  -796,  -796,  -796,  -796,
+     109,   331,   -47,   -44,     4,  -796,  -796,  -796,  -796,    12,
+      15,  -796,  -796,   145,   356,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,   -18,  -796,  -796,  -796,  -796,  -796,  -796,   101,  -796,
+     -51,  -796,  -568,   -35,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,   -26,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,   -40,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,   -54,  -796,  -796,  -796,   -41,   341,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,   -43,  -796,  -796,  -796,  -796,
+    -796,  -796,  -795,  -796,  -796,  -796,   -29,  -796,  -796,  -796,
+     -15,   406,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -789,  -796,   -68,  -796,   -55,  -796,    19,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,   -22,  -796,  -796,  -172,   -63,  -796,
+    -796,  -796,  -796,  -796,   -13,  -796,  -796,  -796,     0,  -796,
+     409,  -796,   -66,  -796,  -796,  -796,  -796,  -796,   -64,  -796,
+    -796,  -796,  -796,  -796,   -19,  -796,  -796,  -796,   -12,  -796,
+    -796,  -796,    -5,  -796,   401,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,   -32,  -796,  -796,  -796,
+     -23,   431,  -796,  -796,   -57,  -796,   -39,  -796,   -62,  -796,
+    -796,  -796,    10,  -796,  -796,  -796,    13,  -796,   424,    -7,
+    -796,    -3,  -796,     8,  -796,   223,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -787,  -796,  -796,  -796,  -796,  -796,    20,
+    -796,  -796,  -796,  -135,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,     1,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,   246,   397,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,  -796,
+    -796,  -796,  -337,   393,  -796,  -796,  -796,  -796,  -796,  -796,
+     282,   400,  -796,  -796,  -796,    -9,  -796,  -796,  -142,  -796,
+    -796,  -796,  -796,  -796,  -796,  -154,  -796,  -796,  -170,  -796,
+    -796,  -796,  -796,  -796
   };
 
   const short
@@ -4195,252 +4195,254 @@ namespace isc { namespace dhcp {
   {
       -1,    15,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    38,    39,    40,    69,
-     600,    87,    88,    41,    68,    84,    85,   611,   780,   859,
-     860,   346,    43,    70,    96,    97,    98,   355,    45,    71,
-     137,   138,   139,   140,   141,   142,   143,   380,   144,   145,
-     146,   147,   365,   176,   177,    47,    72,   178,   398,   179,
-     399,   614,   180,   400,   617,   181,   148,   373,   149,   366,
-     673,   674,   675,   797,   150,   374,   151,   375,   714,   715,
-     716,   819,   693,   694,   695,   800,   975,   696,   801,   697,
-     802,   698,   803,   699,   700,   432,   701,   702,   703,   704,
-     705,   706,   707,   708,   809,   709,   810,   710,   711,   152,
-     387,   738,   739,   740,   741,   742,   743,   744,   153,   390,
-     753,   754,   755,   842,    61,    79,   302,   303,   304,   445,
-     305,   446,   154,   391,   762,   763,   764,   765,   766,   767,
-     768,   769,   155,   381,   718,   719,   720,   822,    49,    73,
-     201,   202,   203,   408,   204,   404,   205,   405,   206,   406,
-     207,   409,   208,   413,   209,   412,   210,   411,   628,   211,
-     156,   384,   730,   731,   732,   831,   909,   910,   157,   382,
-      55,    76,   722,   723,   724,   825,    57,    77,   267,   268,
-     269,   270,   271,   272,   273,   431,   274,   435,   275,   434,
-     276,   277,   436,   278,   158,   383,   726,   727,   728,   828,
-      59,    78,   288,   289,   290,   291,   292,   440,   293,   294,
-     295,   296,   213,   407,   782,   783,   784,   861,    51,    74,
-     226,   227,   228,   417,   159,   385,   160,   386,   161,   389,
-     749,   750,   751,   839,    53,    75,   243,   244,   245,   162,
-     370,   163,   371,   164,   372,   249,   427,   787,   864,   250,
-     421,   251,   422,   252,   424,   253,   423,   254,   426,   255,
-     425,   256,   420,   220,   414,   788,   165,   388,   746,   747,
-     836,   931,   932,   933,   934,   935,   987,   936,   166,   167,
-     393,   775,   776,   777,   853,   778,   854,   168,   394,   169,
-     395,    63,    80,   324,   325,   326,   327,   450,   328,   451,
-     329,   330,   453,   331,   332,   333,   456,   654,   334,   457,
-     335,   336,   337,   460,   661,   338,   461,   339,   462,   340,
-     463,    99,   357,   100,   358,   101,   359,   170,   363,   364,
-      67,    82,   347,   348,   349,   469,   102,   356,    65,    81,
-     342,   343,   344,   466,   790,   791,   866,   964,   965,   966,
-     967,  1000,   968,   998,  1015,  1016,  1017,  1024,  1025,  1026,
-    1031,  1027,  1028,  1029
+     601,    87,    88,    41,    68,    84,    85,   617,   781,   860,
+     861,   347,    43,    70,    96,    97,    98,   356,    45,    71,
+     138,   139,   140,   141,   142,   143,   144,   381,   145,   146,
+     147,   148,   366,   178,   179,    47,    72,   180,   400,   181,
+     401,   620,   182,   402,   623,   183,   149,   374,   150,   367,
+     674,   675,   676,   798,   151,   375,   152,   376,   715,   716,
+     717,   820,   694,   695,   696,   801,   976,   697,   802,   698,
+     803,   699,   804,   700,   701,   433,   702,   703,   704,   705,
+     706,   707,   708,   709,   810,   710,   811,   711,   712,   153,
+     389,   739,   740,   741,   742,   743,   744,   745,   154,   392,
+     754,   755,   756,   843,    61,    79,   303,   304,   305,   446,
+     306,   447,   155,   393,   763,   764,   765,   766,   767,   768,
+     769,   770,   156,   382,   719,   720,   721,   823,    49,    73,
+     202,   203,   204,   410,   205,   406,   206,   407,   207,   408,
+     208,   411,   209,   414,   210,   413,   157,   388,   607,   212,
+     158,   385,   731,   732,   733,   832,   910,   911,   159,   383,
+      55,    76,   723,   724,   725,   826,    57,    77,   268,   269,
+     270,   271,   272,   273,   274,   432,   275,   436,   276,   435,
+     277,   278,   437,   279,   160,   384,   727,   728,   729,   829,
+      59,    78,   289,   290,   291,   292,   293,   441,   294,   295,
+     296,   297,   214,   409,   783,   784,   785,   862,    51,    74,
+     227,   228,   229,   418,   161,   386,   162,   387,   163,   391,
+     750,   751,   752,   840,    53,    75,   244,   245,   246,   164,
+     371,   165,   372,   166,   373,   250,   428,   788,   865,   251,
+     422,   252,   423,   253,   425,   254,   424,   255,   427,   256,
+     426,   257,   421,   221,   415,   789,   167,   390,   747,   748,
+     837,   932,   933,   934,   935,   936,   988,   937,   168,   169,
+     395,   776,   777,   778,   854,   779,   855,   170,   396,   171,
+     397,    63,    80,   325,   326,   327,   328,   451,   329,   452,
+     330,   331,   454,   332,   333,   334,   457,   655,   335,   458,
+     336,   337,   338,   461,   662,   339,   462,   340,   463,   341,
+     464,    99,   358,   100,   359,   101,   360,   172,   364,   365,
+      67,    82,   348,   349,   350,   470,   102,   357,    65,    81,
+     343,   344,   345,   467,   791,   792,   867,   965,   966,   967,
+     968,  1001,   969,   999,  1016,  1017,  1018,  1025,  1026,  1027,
+    1032,  1028,  1029,  1030
   };
 
   const unsigned short
   Dhcp4Parser::yytable_[] =
   {
-      95,   136,   175,   195,   222,   239,   223,   265,   284,   301,
-     321,   257,   286,   712,   182,   214,   229,   241,   287,   279,
-     297,   629,   322,   481,   904,   196,   197,   633,   266,   285,
-      83,   216,    31,    89,    32,   905,    33,   908,   652,   123,
-      30,   198,   183,   215,   230,   242,   917,   280,   298,   345,
-     323,   221,   125,   126,   224,   212,   225,   240,    42,   834,
-      44,   217,   835,   246,   192,   199,    46,   193,   171,   172,
-     103,   218,   173,   247,   104,   174,   105,   200,    48,   361,
-      50,   219,    52,   248,   362,   106,    54,   107,   108,   109,
-     110,   111,   112,   113,   114,   115,    56,   110,   111,   112,
-     259,   281,   260,   261,   282,   283,   599,   837,   299,   300,
-     838,   867,   125,   126,   868,   599,   116,   117,   118,   119,
-     120,   121,   396,   299,   300,   122,   123,   397,   125,   126,
-     125,   126,   122,   123,   259,    58,   124,   402,   415,   125,
-     126,    94,   403,   416,    60,   259,   125,   126,   418,   127,
-     128,   447,   653,   419,    62,   129,   448,   125,   126,   920,
-     921,    64,    90,    66,   464,   130,   770,   771,   131,   465,
-      94,    91,    92,    93,  1018,   132,   133,  1019,   904,   134,
-     135,   656,   657,   658,   659,   467,   612,   613,    94,   905,
-     468,   908,    34,    35,    36,    37,   624,   625,   626,   627,
-     917,    94,    94,   108,   109,   110,   111,   112,   971,   972,
-     973,   974,    86,   110,   111,   112,   660,    94,   470,    94,
-     122,   470,   957,   471,   958,   959,   584,   341,    94,   396,
-     350,   116,   117,   118,   793,    94,   351,   184,   185,   186,
-     889,   123,   467,   470,   353,   670,    94,   794,   795,   123,
-     615,   616,   187,   352,   125,   126,   188,   189,   190,   191,
-     402,   354,   125,   126,   428,   796,   192,   798,   429,   193,
-     129,  1020,   799,   231,  1021,  1022,  1023,   194,   258,   232,
-     233,   234,   235,   236,   237,   816,   238,   816,   676,   360,
-     817,    95,   818,   677,   678,   679,   680,   681,   682,   683,
-     684,   685,   686,   687,   688,   689,   690,   691,   367,   259,
-     368,   260,   261,   472,   473,   262,   263,   264,   851,   259,
-     855,   125,   126,   852,   464,   856,   136,   369,   376,   857,
-     238,   785,   175,   756,   757,   758,   759,   760,   761,   377,
-     378,   816,   415,    94,   182,   195,   981,   982,   222,   379,
-     223,    94,   392,   733,   734,   735,   736,   214,   737,   239,
-     229,   985,   430,   401,   410,   447,   986,   196,   197,   265,
-     992,   241,   183,   216,   284,   418,   438,  1001,   286,   433,
-     996,   279,  1002,   198,   287,   215,   297,  1035,   230,   437,
-     266,   439,  1036,   441,   321,   285,   442,   212,   224,   242,
-     225,   443,   444,   217,   449,   452,   322,   199,   454,   280,
-      94,   240,   455,   218,   298,   458,   459,   246,   474,   200,
-      94,   475,   476,   219,   477,   478,   479,   247,   108,   109,
-     110,   111,   112,   482,   323,   483,   484,   248,   485,   581,
-     582,   583,   486,   487,   488,   489,   490,   491,   492,   997,
-     493,   498,   494,   495,   496,   497,   116,   117,   118,   499,
-     500,   121,   501,   502,   503,   504,   123,   259,   505,   510,
-     506,   507,   508,   509,   511,   512,   513,   515,   516,   125,
-     126,   517,   189,   520,   191,   521,   518,   522,   523,   524,
-     525,   192,   526,   527,   193,   528,   529,   530,   532,   534,
-     535,   536,   194,   537,   538,   539,   540,   541,   543,   136,
-     544,   546,   545,   547,   548,   549,   175,   551,   648,   552,
-     553,   692,   692,   555,   556,   558,   559,   560,   182,   561,
-     562,   563,   564,   565,   566,   567,   569,   772,   568,   321,
-     667,   125,   126,   570,   571,   572,   574,   576,   578,   773,
-     672,   322,   579,   580,   585,   586,   183,   587,   591,   588,
-     589,   590,   592,   593,   595,   596,   597,   594,    94,   598,
-      32,   601,   602,   603,   604,   605,   804,   774,   606,   323,
-     607,   609,   610,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   621,   631,   618,   619,
-     620,   622,   319,   320,     1,     2,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,   665,   623,
-     666,   713,   630,   717,   721,   725,   729,   632,   634,   745,
-      94,   748,   752,   781,   789,   805,   806,   807,   808,   811,
-     635,   636,   812,   637,   813,   638,   814,   639,   815,   655,
-     821,   820,   640,   641,   823,   642,   824,   826,   827,   830,
-     829,   845,   833,   643,   832,   841,   840,   843,   844,   862,
-     644,   846,   847,   645,   848,   849,   646,   647,   850,   649,
-     650,   651,   863,   662,   865,   953,   663,   869,   870,   664,
-     858,   872,   873,   874,   875,   881,   877,   876,   882,   878,
-     949,   880,   879,   883,   884,   950,   952,   956,   608,   988,
-     983,   990,   984,   671,   989,   885,   999,   991,   886,  1004,
-     942,   887,   943,   944,  1007,  1009,  1014,  1012,   945,  1032,
-    1033,   946,   947,  1034,  1037,   519,   668,   480,   514,   871,
-     970,   976,   890,   977,   978,   979,   692,   980,   993,   692,
-     994,   995,   195,  1008,  1011,   265,  1005,  1013,   284,  1039,
-    1040,   897,   286,   906,   214,  1038,   922,   279,   287,   239,
-     297,   924,   301,   912,   196,   197,   266,  1042,   926,   285,
-     216,   241,   903,   898,   899,   772,   792,   923,   888,   919,
-     198,   222,   215,   223,   941,   280,   960,   773,   298,   900,
-     557,   913,   940,   229,   212,   948,   927,   892,   962,   242,
-     217,   907,   891,   911,   199,  1003,   894,   961,   925,   914,
-     218,   240,   531,   901,   928,   774,   200,   246,   918,   915,
-     219,   230,   893,   896,   929,   902,   963,   247,   895,   916,
-     955,   224,   554,   225,   930,   954,   533,   248,   550,  1006,
-     939,   938,   542,   786,   937,   951,   779,   577,   669,  1010,
-     969,   573,  1030,  1041,     0,     0,     0,     0,     0,     0,
-       0,     0,   575,     0,     0,     0,     0,     0,     0,     0,
+      95,   137,   177,   196,   223,   240,   224,   266,   285,   302,
+     322,   217,   287,   258,   288,   184,   215,   230,   242,   225,
+     280,   298,    83,   323,   630,   713,   197,   482,    89,   198,
+     634,   300,   301,   185,   216,   231,   243,   905,   281,   299,
+      31,   324,    32,   906,    33,   918,   653,   300,   301,   600,
+      30,   267,   286,   346,   213,   226,   241,   173,   174,   600,
+     362,   175,   398,    42,   176,   363,   218,   399,   247,    44,
+     219,    46,   248,   404,   125,   126,   103,   199,   405,   416,
+     104,   220,   105,   249,   417,   200,   835,   838,   201,   836,
+     839,   106,   211,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   110,   111,   112,   657,   658,   659,   660,    94,
+     259,  1021,   771,   772,  1022,  1023,  1024,    48,   868,   125,
+     126,   869,   116,   117,   118,   119,   120,   121,   419,   448,
+     465,   122,   123,   420,   449,   466,    50,   122,   123,   260,
+     661,   260,   124,   261,   262,   125,   126,   263,   264,   265,
+     127,   125,   126,   125,   126,   128,   129,    90,    52,  1019,
+     654,   130,  1020,    94,   921,   922,    91,    92,    93,   618,
+     619,   131,   239,   786,   132,   260,   282,   261,   262,   283,
+     284,   133,   134,    94,   468,   135,   136,   125,   126,   469,
+      54,   905,   108,   109,   110,   111,   112,   906,    56,   918,
+      34,    35,    36,    37,   471,   471,    94,   398,    94,   472,
+     585,   123,   794,   468,   471,   110,   111,   112,   795,   796,
+     116,   117,   118,   222,   125,   126,   186,   187,   188,    58,
+     123,    60,   404,   799,    94,    62,   193,   797,   800,   194,
+      94,   189,    94,   125,   126,   190,   191,   192,   127,   671,
+      64,   123,   890,   621,   622,   193,   817,   817,   194,   130,
+      86,   818,   819,   852,   125,   126,   195,   122,   853,    66,
+     108,   109,   110,   111,   112,   232,    94,   603,   604,   605,
+     606,   233,   234,   235,   236,   237,   238,   342,   239,   856,
+     465,   817,    95,   352,   857,   858,   982,   416,   116,   117,
+     118,   351,   983,   121,   353,   986,   473,   474,   123,   260,
+     987,   354,   355,    94,   757,   758,   759,   760,   761,   762,
+     448,   125,   126,   361,   191,   993,   127,   368,   137,   369,
+     419,   475,    94,   193,   177,   997,   194,   734,   735,   736,
+     737,   370,   738,  1002,   195,  1036,   196,   184,  1003,   223,
+    1037,   224,   377,    94,   217,   972,   973,   974,   975,   215,
+     240,   378,   230,   379,   225,   185,   380,   394,   403,   197,
+     266,   412,   198,   242,   429,   285,   430,   216,   431,   287,
+     231,   288,   434,   280,   438,   439,   440,   444,   298,   442,
+     443,   243,   260,   445,   486,   322,   450,   213,   453,   455,
+     226,   281,   456,   459,   125,   126,   299,   460,   323,   218,
+      94,   241,   476,   219,   267,   477,   478,   479,   480,   286,
+     199,   483,   484,   247,   220,   485,   324,   248,   200,   487,
+     489,   201,   582,   583,   584,   211,   488,   490,   249,   491,
+     492,   493,   494,   495,   496,   497,   498,   499,   677,   500,
+     501,   502,   998,   678,   679,   680,   681,   682,   683,   684,
+     685,   686,   687,   688,   689,   690,   691,   692,   503,   958,
+     504,   959,   960,   505,   506,   507,   508,   509,   510,   260,
+     511,   512,   513,   514,   515,   517,   518,   519,   520,   522,
+     523,   524,   525,    94,     1,     2,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,   526,   527,
+     137,   649,   528,   529,   530,   531,   533,   177,   535,   536,
+     537,   538,   693,   693,   539,   540,   541,   542,   544,   545,
+     184,   546,   547,   668,   548,   549,   550,   552,   556,   125,
+     126,   557,   553,   773,   554,   322,   560,   561,   185,   559,
+     562,   563,   566,   564,   565,   567,   774,   568,   323,   569,
+     570,   571,   572,   573,   575,   577,   579,   589,   673,   590,
+     580,   581,   586,   587,   775,   588,   324,   592,   593,   594,
+      94,   307,   308,   309,   310,   311,   312,   313,   314,   315,
+     316,   317,   318,   319,   591,   595,   596,   597,   598,   599,
+     320,   321,    32,   608,   602,   609,   610,   611,   877,   624,
+     612,   613,   615,   616,   625,   626,   627,   628,   629,   631,
+     632,   633,   635,   636,   637,   638,   639,   640,    94,   656,
+     641,   666,   642,   643,   667,   714,   822,   718,   722,   726,
+     644,   730,   645,   746,   749,   753,   782,   790,   805,   646,
+     806,   807,   808,   809,   647,   648,   650,   651,   652,   663,
+     664,   665,   812,   813,   814,   815,   816,   859,   825,   821,
+     824,   828,   827,   830,   831,   833,   834,   842,   841,   845,
+     864,   844,   846,   847,   848,   849,   850,   851,   614,   669,
+     863,   871,   870,   866,   873,   874,   875,   876,   882,   883,
+     878,   879,   950,   951,   880,   881,   884,   885,   953,   954,
+     886,   957,   887,   984,   989,   991,   943,   888,   944,   945,
+     946,   947,   985,   990,   992,  1000,  1005,  1008,  1010,   516,
+    1013,  1033,   672,   948,   971,  1015,  1034,   977,   978,  1035,
+     979,   980,   981,   994,   995,   996,  1038,   693,  1009,  1006,
+     693,  1012,  1014,   196,  1040,  1043,   266,  1039,   481,   285,
+     521,   217,   898,   287,   907,   288,   215,   923,   793,   280,
+     240,   891,   298,   302,   925,   913,   197,   908,  1041,   198,
+     927,   872,   889,   242,   216,   899,   773,   281,   900,   558,
+     299,   942,   223,   914,   224,   920,   893,   961,   928,   774,
+     267,   243,   941,   286,   213,   230,   904,   225,   892,   949,
+     963,   924,   919,   912,  1004,   895,   218,   775,   926,   897,
+     219,   241,   532,   231,   896,   915,   894,   199,   964,   916,
+     929,   220,   956,   247,   930,   200,   901,   248,   201,   955,
+     917,   962,   211,   226,   902,   931,   555,   903,   249,   551,
+     534,   909,   940,   939,   543,   787,  1007,   952,   938,   970,
+    1011,   780,   574,   670,   578,  1031,  1042,     0,   576,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   897,     0,   906,     0,     0,
-     922,     0,     0,     0,     0,   924,     0,   912,     0,     0,
-       0,   960,   926,     0,     0,     0,   903,   898,   899,     0,
-       0,   923,     0,   962,     0,     0,     0,     0,     0,     0,
-       0,     0,   961,   900,     0,   913,     0,     0,     0,     0,
-     927,     0,     0,     0,     0,   907,     0,   911,     0,     0,
-       0,   963,   925,   914,     0,     0,     0,   901,   928,     0,
-       0,     0,     0,   915,     0,     0,     0,     0,   929,   902,
-       0,     0,     0,   916,     0,     0,     0,     0,   930
+       0,     0,     0,     0,     0,     0,   898,     0,   907,     0,
+       0,   923,     0,     0,     0,     0,     0,     0,   925,   913,
+       0,   908,   961,     0,   927,     0,     0,     0,     0,   899,
+       0,     0,   900,     0,     0,   963,     0,   914,     0,     0,
+       0,     0,   928,     0,     0,     0,     0,     0,     0,     0,
+     904,     0,     0,   964,     0,   924,     0,   912,     0,     0,
+       0,     0,   926,     0,     0,     0,   962,     0,     0,   915,
+       0,     0,     0,   916,   929,     0,     0,     0,   930,     0,
+     901,     0,     0,     0,   917,     0,     0,     0,   902,   931,
+       0,   903,     0,     0,     0,   909
   };
 
   const short
   Dhcp4Parser::yycheck_[] =
   {
       70,    71,    72,    73,    74,    75,    74,    77,    78,    79,
-      80,    76,    78,   592,    72,    73,    74,    75,    78,    77,
-      78,   528,    80,   363,   831,    73,    73,   534,    77,    78,
-      68,    73,     5,    10,     7,   831,     9,   831,    17,    63,
-       0,    73,    72,    73,    74,    75,   831,    77,    78,    12,
-      80,    75,    76,    77,    74,    73,    74,    75,     7,     3,
-       7,    73,     6,    75,    88,    73,     7,    91,    14,    15,
-       7,    73,    18,    75,    11,    21,    13,    73,     7,     3,
-       7,    73,     7,    75,     8,    22,     7,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,     7,    27,    28,    29,
-      64,    65,    66,    67,    68,    69,   503,     3,   103,   104,
-       6,     3,    76,    77,     6,   512,    53,    54,    55,    56,
-      57,    58,     3,   103,   104,    62,    63,     8,    76,    77,
-      76,    77,    62,    63,    64,     7,    73,     3,     3,    76,
-      77,   165,     8,     8,     7,    64,    76,    77,     3,    86,
-      87,     3,   131,     8,     7,    92,     8,    76,    77,    89,
-      90,     7,   139,     7,     3,   102,   114,   115,   105,     8,
-     165,   148,   149,   150,     3,   112,   113,     6,   985,   116,
-     117,   133,   134,   135,   136,     3,    16,    17,   165,   985,
-       8,   985,   165,   166,   167,   168,    82,    83,    84,    85,
-     985,   165,   165,    25,    26,    27,    28,    29,    34,    35,
-      36,    37,   165,    27,    28,    29,   168,   165,     3,   165,
-      62,     3,   141,     8,   143,   144,     8,   140,   165,     3,
-       6,    53,    54,    55,     8,   165,     3,    59,    60,    61,
-     819,    63,     3,     3,     8,   585,   165,     8,     8,    63,
-      19,    20,    74,     4,    76,    77,    78,    79,    80,    81,
-       3,     3,    76,    77,     8,     8,    88,     3,     3,    91,
-      92,   142,     8,    87,   145,   146,   147,    99,    33,    93,
-      94,    95,    96,    97,    98,     3,   100,     3,    33,     4,
-       8,   361,     8,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,     4,    64,
-       4,    66,    67,   351,   352,    70,    71,    72,     3,    64,
-       3,    76,    77,     8,     3,     8,   396,     4,     4,     8,
-     100,   101,   402,   106,   107,   108,   109,   110,   111,     4,
-       4,     3,     3,   165,   402,   415,     8,     8,   418,     4,
-     418,   165,     4,    93,    94,    95,    96,   415,    98,   429,
-     418,     3,     8,     4,     4,     3,     8,   415,   415,   439,
-       8,   429,   402,   415,   444,     3,     8,     3,   444,     4,
-       8,   439,     8,   415,   444,   415,   444,     3,   418,     4,
-     439,     3,     8,     4,   464,   444,     4,   415,   418,   429,
-     418,     8,     3,   415,     4,     4,   464,   415,     4,   439,
-     165,   429,     4,   415,   444,     4,     4,   429,   165,   415,
-     165,     4,     4,   415,     4,     4,     4,   429,    25,    26,
-      27,    28,    29,     4,   464,     4,     4,   429,   168,   477,
-     478,   479,   168,   168,     4,     4,     4,     4,     4,   956,
-       4,     4,   166,   166,   166,   166,    53,    54,    55,     4,
-       4,    58,     4,     4,     4,     4,    63,    64,     4,   166,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,    76,
-      77,     4,    79,     4,    81,     4,   168,     4,     4,     4,
-       4,    88,   166,     4,    91,     4,     4,     4,     4,     4,
-       4,     4,    99,     4,     4,     4,     4,     4,     4,   579,
-       4,     4,   166,     4,     4,   168,   586,     4,   556,   168,
-     168,   591,   592,     4,     4,   168,     4,     4,   586,   166,
-       4,   166,   166,     4,     4,   168,     4,   607,   168,   609,
-     578,    76,    77,     4,     4,     4,     4,     4,     4,   607,
-      23,   609,     7,     7,     7,     7,   586,     7,     7,   165,
-     165,   165,     7,     5,     5,     5,     5,   165,   165,     5,
-       7,   165,     5,     5,     5,     5,     4,   607,     7,   609,
-       7,     7,     5,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,     5,     7,   165,   165,
-     165,   165,   137,   138,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,     5,   165,
-       5,     7,   165,     7,     7,     7,     7,   165,   165,     7,
-     165,     7,     7,     7,     7,     4,     4,     4,     4,     4,
-     165,   165,     4,   165,     4,   165,     4,   165,     4,   132,
-       3,     6,   165,   165,     6,   165,     3,     6,     3,     3,
-       6,     4,     3,   165,     6,     3,     6,     6,     3,     6,
-     165,     4,     4,   165,     4,     4,   165,   165,     4,   165,
-     165,   165,     3,   165,     8,     3,   165,     6,     4,   165,
-     165,     4,     4,     4,     4,     4,   168,   166,     4,   166,
-       4,   166,   168,   166,   166,     4,     6,     4,   512,     4,
-       8,     3,     8,   586,     8,   166,     4,     8,   166,     4,
-     166,   168,   166,   166,     4,     4,     7,     5,   166,     4,
-       4,   166,   166,     4,     4,   402,   579,   361,   396,   798,
-     165,   165,   821,   165,   165,   165,   816,   165,   165,   819,
-     165,   165,   822,   166,   165,   825,   168,   165,   828,   166,
-     166,   831,   828,   831,   822,   168,   836,   825,   828,   839,
-     828,   836,   842,   831,   822,   822,   825,   165,   836,   828,
-     822,   839,   831,   831,   831,   855,   666,   836,   816,   834,
-     822,   861,   822,   861,   844,   825,   866,   855,   828,   831,
-     447,   831,   842,   861,   822,   851,   836,   824,   866,   839,
-     822,   831,   822,   831,   822,   985,   827,   866,   836,   831,
-     822,   839,   415,   831,   836,   855,   822,   839,   833,   831,
-     822,   861,   825,   830,   836,   831,   866,   839,   828,   831,
-     863,   861,   444,   861,   836,   861,   418,   839,   439,   990,
-     841,   839,   429,   631,   837,   855,   609,   470,   580,  1001,
-     867,   464,  1018,  1035,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   467,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      80,    73,    78,    76,    78,    72,    73,    74,    75,    74,
+      77,    78,    68,    80,   529,   593,    73,   364,    10,    73,
+     535,   103,   104,    72,    73,    74,    75,   832,    77,    78,
+       5,    80,     7,   832,     9,   832,    17,   103,   104,   504,
+       0,    77,    78,    12,    73,    74,    75,    14,    15,   514,
+       3,    18,     3,     7,    21,     8,    73,     8,    75,     7,
+      73,     7,    75,     3,    76,    77,     7,    73,     8,     3,
+      11,    73,    13,    75,     8,    73,     3,     3,    73,     6,
+       6,    22,    73,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    27,    28,    29,   133,   134,   135,   136,   165,
+      33,   142,   114,   115,   145,   146,   147,     7,     3,    76,
+      77,     6,    53,    54,    55,    56,    57,    58,     3,     3,
+       3,    62,    63,     8,     8,     8,     7,    62,    63,    64,
+     168,    64,    73,    66,    67,    76,    77,    70,    71,    72,
+      81,    76,    77,    76,    77,    86,    87,   139,     7,     3,
+     131,    92,     6,   165,    89,    90,   148,   149,   150,    16,
+      17,   102,   100,   101,   105,    64,    65,    66,    67,    68,
+      69,   112,   113,   165,     3,   116,   117,    76,    77,     8,
+       7,   986,    25,    26,    27,    28,    29,   986,     7,   986,
+     165,   166,   167,   168,     3,     3,   165,     3,   165,     8,
+       8,    63,     8,     3,     3,    27,    28,    29,     8,     8,
+      53,    54,    55,    75,    76,    77,    59,    60,    61,     7,
+      63,     7,     3,     3,   165,     7,    88,     8,     8,    91,
+     165,    74,   165,    76,    77,    78,    79,    80,    81,   586,
+       7,    63,   820,    19,    20,    88,     3,     3,    91,    92,
+     165,     8,     8,     3,    76,    77,    99,    62,     8,     7,
+      25,    26,    27,    28,    29,    87,   165,    82,    83,    84,
+      85,    93,    94,    95,    96,    97,    98,   140,   100,     3,
+       3,     3,   362,     3,     8,     8,     8,     3,    53,    54,
+      55,     6,     8,    58,     4,     3,   352,   353,    63,    64,
+       8,     8,     3,   165,   106,   107,   108,   109,   110,   111,
+       3,    76,    77,     4,    79,     8,    81,     4,   398,     4,
+       3,   165,   165,    88,   404,     8,    91,    93,    94,    95,
+      96,     4,    98,     3,    99,     3,   416,   404,     8,   419,
+       8,   419,     4,   165,   416,    34,    35,    36,    37,   416,
+     430,     4,   419,     4,   419,   404,     4,     4,     4,   416,
+     440,     4,   416,   430,     8,   445,     3,   416,     8,   445,
+     419,   445,     4,   440,     4,     8,     3,     8,   445,     4,
+       4,   430,    64,     3,   168,   465,     4,   416,     4,     4,
+     419,   440,     4,     4,    76,    77,   445,     4,   465,   416,
+     165,   430,     4,   416,   440,     4,     4,     4,     4,   445,
+     416,     4,     4,   430,   416,     4,   465,   430,   416,   168,
+       4,   416,   478,   479,   480,   416,   168,     4,   430,     4,
+       4,     4,     4,   166,   166,   166,   166,     4,    33,     4,
+       4,     4,   957,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,     4,   141,
+       4,   143,   144,     4,     4,     4,     4,     4,     4,    64,
+       4,   166,     4,     4,     4,     4,     4,     4,   168,     4,
+       4,     4,     4,   165,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,     4,     4,
+     580,   557,   166,     4,     4,     4,     4,   587,     4,     4,
+       4,     4,   592,   593,     4,     4,     4,     4,     4,     4,
+     587,   166,     4,   579,     4,     4,   168,     4,     4,    76,
+      77,     4,   168,   613,   168,   615,     4,     4,   587,   168,
+     166,     4,     4,   166,   166,     4,   613,   168,   615,   168,
+       4,     4,     4,     4,     4,     4,     4,   165,    23,   165,
+       7,     7,     7,     7,   613,     7,   615,     7,     7,     5,
+     165,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   165,   165,     5,     5,     5,     5,
+     137,   138,     7,     5,   165,     5,     5,     5,   166,   165,
+       7,     7,     7,     5,   165,   165,     5,   165,   165,   165,
+       7,   165,   165,   165,   165,   165,   165,   165,   165,   132,
+     165,     5,   165,   165,     5,     7,     3,     7,     7,     7,
+     165,     7,   165,     7,     7,     7,     7,     7,     4,   165,
+       4,     4,     4,     4,   165,   165,   165,   165,   165,   165,
+     165,   165,     4,     4,     4,     4,     4,   165,     3,     6,
+       6,     3,     6,     6,     3,     6,     3,     3,     6,     3,
+       3,     6,     4,     4,     4,     4,     4,     4,   514,   580,
+       6,     4,     6,     8,     4,     4,     4,     4,     4,     4,
+     168,   166,     4,     4,   168,   166,   166,   166,     6,     3,
+     166,     4,   166,     8,     4,     3,   166,   168,   166,   166,
+     166,   166,     8,     8,     8,     4,     4,     4,     4,   398,
+       5,     4,   587,   166,   165,     7,     4,   165,   165,     4,
+     165,   165,   165,   165,   165,   165,     4,   817,   166,   168,
+     820,   165,   165,   823,   166,   165,   826,   168,   362,   829,
+     404,   823,   832,   829,   832,   829,   823,   837,   667,   826,
+     840,   822,   829,   843,   837,   832,   823,   832,   166,   823,
+     837,   799,   817,   840,   823,   832,   856,   826,   832,   448,
+     829,   845,   862,   832,   862,   835,   825,   867,   837,   856,
+     826,   840,   843,   829,   823,   862,   832,   862,   823,   852,
+     867,   837,   834,   832,   986,   828,   823,   856,   837,   831,
+     823,   840,   416,   862,   829,   832,   826,   823,   867,   832,
+     837,   823,   864,   840,   837,   823,   832,   840,   823,   862,
+     832,   867,   823,   862,   832,   837,   445,   832,   840,   440,
+     419,   832,   842,   840,   430,   632,   991,   856,   838,   868,
+    1002,   615,   465,   581,   471,  1019,  1036,    -1,   468,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   985,    -1,   985,    -1,    -1,
-     990,    -1,    -1,    -1,    -1,   990,    -1,   985,    -1,    -1,
-      -1,  1001,   990,    -1,    -1,    -1,   985,   985,   985,    -1,
-      -1,   990,    -1,  1001,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1001,   985,    -1,   985,    -1,    -1,    -1,    -1,
-     990,    -1,    -1,    -1,    -1,   985,    -1,   985,    -1,    -1,
-      -1,  1001,   990,   985,    -1,    -1,    -1,   985,   990,    -1,
-      -1,    -1,    -1,   985,    -1,    -1,    -1,    -1,   990,   985,
-      -1,    -1,    -1,   985,    -1,    -1,    -1,    -1,   990
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   986,    -1,   986,    -1,
+      -1,   991,    -1,    -1,    -1,    -1,    -1,    -1,   991,   986,
+      -1,   986,  1002,    -1,   991,    -1,    -1,    -1,    -1,   986,
+      -1,    -1,   986,    -1,    -1,  1002,    -1,   986,    -1,    -1,
+      -1,    -1,   991,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     986,    -1,    -1,  1002,    -1,   991,    -1,   986,    -1,    -1,
+      -1,    -1,   991,    -1,    -1,    -1,  1002,    -1,    -1,   986,
+      -1,    -1,    -1,   986,   991,    -1,    -1,    -1,   991,    -1,
+     986,    -1,    -1,    -1,   986,    -1,    -1,    -1,   986,   991,
+      -1,   986,    -1,    -1,    -1,   986
   };
 
   const unsigned short
@@ -4458,99 +4460,99 @@ namespace isc { namespace dhcp {
      139,   148,   149,   150,   165,   200,   203,   204,   205,   500,
      502,   504,   515,     7,    11,    13,    22,    24,    25,    26,
       27,    28,    29,    30,    31,    32,    53,    54,    55,    56,
-      57,    58,    62,    63,    73,    76,    77,    86,    87,    92,
-     102,   105,   112,   113,   116,   117,   200,   209,   210,   211,
-     212,   213,   214,   215,   217,   218,   219,   220,   235,   237,
-     243,   245,   278,   287,   301,   311,   339,   347,   373,   403,
-     405,   407,   418,   420,   422,   445,   457,   458,   466,   468,
-     506,    14,    15,    18,    21,   200,   222,   223,   226,   228,
-     231,   234,   403,   405,    59,    60,    61,    74,    78,    79,
-      80,    81,    88,    91,    99,   200,   211,   212,   213,   218,
-     219,   319,   320,   321,   323,   325,   327,   329,   331,   333,
-     335,   338,   373,   391,   403,   405,   407,   418,   420,   422,
-     442,    75,   200,   331,   333,   373,   399,   400,   401,   403,
-     405,    87,    93,    94,    95,    96,    97,    98,   100,   200,
-     373,   403,   405,   415,   416,   417,   418,   420,   422,   424,
-     428,   430,   432,   434,   436,   438,   440,   347,    33,    64,
-      66,    67,    70,    71,    72,   200,   263,   357,   358,   359,
-     360,   361,   362,   363,   365,   367,   369,   370,   372,   403,
-     405,    65,    68,    69,   200,   263,   361,   367,   381,   382,
-     383,   384,   385,   387,   388,   389,   390,   403,   405,   103,
-     104,   200,   295,   296,   297,   299,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   137,
-     138,   200,   403,   405,   472,   473,   474,   475,   477,   479,
-     480,   482,   483,   484,   487,   489,   490,   491,   494,   496,
-     498,   140,   519,   520,   521,    12,   200,   511,   512,   513,
-       6,     3,     4,     8,     3,   206,   516,   501,   503,   505,
-       4,     3,     8,   507,   508,   221,   238,     4,     4,     4,
-     419,   421,   423,   236,   244,   246,     4,     4,     4,     4,
-     216,   312,   348,   374,   340,   404,   406,   279,   446,   408,
-     288,   302,     4,   459,   467,   469,     3,     8,   227,   229,
-     232,     4,     3,     8,   324,   326,   328,   392,   322,   330,
-       4,   336,   334,   332,   443,     3,     8,   402,     3,     8,
-     441,   429,   431,   435,   433,   439,   437,   425,     8,     3,
-       8,   364,   264,     4,   368,   366,   371,     4,     8,     3,
-     386,     4,     4,     8,     3,   298,   300,     3,     8,     4,
-     476,   478,     4,   481,     4,     4,   485,   488,     4,     4,
-     492,   495,   497,   499,     3,     8,   522,     3,     8,   514,
-       3,     8,   185,   185,   165,     4,     4,     4,     4,     4,
-     204,   511,     4,     4,     4,   168,   168,   168,     4,     4,
-       4,     4,     4,     4,   166,   166,   166,   166,     4,     4,
+      57,    58,    62,    63,    73,    76,    77,    81,    86,    87,
+      92,   102,   105,   112,   113,   116,   117,   200,   209,   210,
+     211,   212,   213,   214,   215,   217,   218,   219,   220,   235,
+     237,   243,   245,   278,   287,   301,   311,   335,   339,   347,
+     373,   403,   405,   407,   418,   420,   422,   445,   457,   458,
+     466,   468,   506,    14,    15,    18,    21,   200,   222,   223,
+     226,   228,   231,   234,   403,   405,    59,    60,    61,    74,
+      78,    79,    80,    88,    91,    99,   200,   211,   212,   213,
+     218,   219,   319,   320,   321,   323,   325,   327,   329,   331,
+     333,   335,   338,   373,   391,   403,   405,   407,   418,   420,
+     422,   442,    75,   200,   331,   333,   373,   399,   400,   401,
+     403,   405,    87,    93,    94,    95,    96,    97,    98,   100,
+     200,   373,   403,   405,   415,   416,   417,   418,   420,   422,
+     424,   428,   430,   432,   434,   436,   438,   440,   347,    33,
+      64,    66,    67,    70,    71,    72,   200,   263,   357,   358,
+     359,   360,   361,   362,   363,   365,   367,   369,   370,   372,
+     403,   405,    65,    68,    69,   200,   263,   361,   367,   381,
+     382,   383,   384,   385,   387,   388,   389,   390,   403,   405,
+     103,   104,   200,   295,   296,   297,   299,   118,   119,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     137,   138,   200,   403,   405,   472,   473,   474,   475,   477,
+     479,   480,   482,   483,   484,   487,   489,   490,   491,   494,
+     496,   498,   140,   519,   520,   521,    12,   200,   511,   512,
+     513,     6,     3,     4,     8,     3,   206,   516,   501,   503,
+     505,     4,     3,     8,   507,   508,   221,   238,     4,     4,
+       4,   419,   421,   423,   236,   244,   246,     4,     4,     4,
+       4,   216,   312,   348,   374,   340,   404,   406,   336,   279,
+     446,   408,   288,   302,     4,   459,   467,   469,     3,     8,
+     227,   229,   232,     4,     3,     8,   324,   326,   328,   392,
+     322,   330,     4,   334,   332,   443,     3,     8,   402,     3,
+       8,   441,   429,   431,   435,   433,   439,   437,   425,     8,
+       3,     8,   364,   264,     4,   368,   366,   371,     4,     8,
+       3,   386,     4,     4,     8,     3,   298,   300,     3,     8,
+       4,   476,   478,     4,   481,     4,     4,   485,   488,     4,
+       4,   492,   495,   497,   499,     3,     8,   522,     3,     8,
+     514,     3,     8,   185,   185,   165,     4,     4,     4,     4,
+       4,   204,   511,     4,     4,     4,   168,   168,   168,     4,
+       4,     4,     4,     4,     4,   166,   166,   166,   166,     4,
        4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-     166,     4,     4,     4,   210,     4,     4,     4,   168,   223,
-       4,     4,     4,     4,     4,     4,   166,     4,     4,     4,
-       4,   320,     4,   400,     4,     4,     4,     4,     4,     4,
-       4,     4,   417,     4,     4,   166,     4,     4,     4,   168,
-     359,     4,   168,   168,   383,     4,     4,   296,   168,     4,
-       4,   166,     4,   166,   166,     4,     4,   168,   168,     4,
-       4,     4,     4,   473,     4,   520,     4,   512,     4,     7,
-       7,   185,   185,   185,     8,     7,     7,     7,   165,   165,
-     165,     7,     7,     5,   165,     5,     5,     5,     5,   187,
-     189,   165,     5,     5,     5,     5,     7,     7,   189,     7,
-       5,   196,    16,    17,   230,    19,    20,   233,   165,   165,
-     165,     5,   165,   165,    82,    83,    84,    85,   337,   196,
-     165,     7,   165,   196,   165,   165,   165,   165,   165,   165,
-     165,   165,   165,   165,   165,   165,   165,   165,   185,   165,
-     165,   165,    17,   131,   486,   132,   133,   134,   135,   136,
-     168,   493,   165,   165,   165,     5,     5,   185,   209,   519,
-     511,   222,    23,   239,   240,   241,    33,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,   200,   251,   252,   253,   256,   258,   260,   262,
-     263,   265,   266,   267,   268,   269,   270,   271,   272,   274,
-     276,   277,   251,     7,   247,   248,   249,     7,   313,   314,
-     315,     7,   351,   352,   353,     7,   375,   376,   377,     7,
-     341,   342,   343,    93,    94,    95,    96,    98,   280,   281,
-     282,   283,   284,   285,   286,     7,   447,   448,     7,   409,
-     410,   411,     7,   289,   290,   291,   106,   107,   108,   109,
-     110,   111,   303,   304,   305,   306,   307,   308,   309,   310,
-     114,   115,   200,   403,   405,   460,   461,   462,   464,   472,
-     197,     7,   393,   394,   395,   101,   424,   426,   444,     7,
-     523,   524,   247,     8,     8,     8,     8,   242,     3,     8,
-     254,   257,   259,   261,     4,     4,     4,     4,     4,   273,
-     275,     4,     4,     4,     4,     4,     3,     8,     8,   250,
-       6,     3,   316,     6,     3,   354,     6,     3,   378,     6,
-       3,   344,     6,     3,     3,     6,   449,     3,     6,   412,
-       6,     3,   292,     6,     3,     4,     4,     4,     4,     4,
-       4,     3,     8,   463,   465,     3,     8,     8,   165,   198,
-     199,   396,     6,     3,   427,     8,   525,     3,     6,     6,
-       4,   240,     4,     4,     4,     4,   166,   168,   166,   168,
-     166,     4,     4,   166,   166,   166,   166,   168,   252,   251,
-     249,   319,   315,   357,   353,   381,   377,   200,   211,   212,
-     213,   218,   219,   263,   311,   329,   331,   333,   335,   345,
-     346,   373,   403,   405,   418,   420,   422,   442,   343,   281,
-      89,    90,   200,   263,   347,   373,   403,   405,   418,   420,
-     422,   450,   451,   452,   453,   454,   456,   448,   415,   411,
-     295,   291,   166,   166,   166,   166,   166,   166,   304,     4,
-       4,   461,     6,     3,   399,   395,     4,   141,   143,   144,
-     200,   263,   403,   405,   526,   527,   528,   529,   531,   524,
-     165,    34,    35,    36,    37,   255,   165,   165,   165,   165,
-     165,     8,     8,     8,     8,     3,     8,   455,     4,     8,
-       3,     8,     8,   165,   165,   165,     8,   196,   532,     4,
-     530,     3,     8,   346,     4,   168,   452,     4,   166,     4,
-     527,   165,     5,   165,     7,   533,   534,   535,     3,     6,
-     142,   145,   146,   147,   536,   537,   538,   540,   541,   542,
-     534,   539,     4,     4,     4,     3,     8,     4,   168,   166,
-     166,   537,   165
+       4,     4,   166,     4,     4,     4,   210,     4,     4,     4,
+     168,   223,     4,     4,     4,     4,     4,     4,   166,     4,
+       4,     4,   320,     4,   400,     4,     4,     4,     4,     4,
+       4,     4,     4,   417,     4,     4,   166,     4,     4,     4,
+     168,   359,     4,   168,   168,   383,     4,     4,   296,   168,
+       4,     4,   166,     4,   166,   166,     4,     4,   168,   168,
+       4,     4,     4,     4,   473,     4,   520,     4,   512,     4,
+       7,     7,   185,   185,   185,     8,     7,     7,     7,   165,
+     165,   165,     7,     7,     5,   165,     5,     5,     5,     5,
+     187,   189,   165,    82,    83,    84,    85,   337,     5,     5,
+       5,     5,     7,     7,   189,     7,     5,   196,    16,    17,
+     230,    19,    20,   233,   165,   165,   165,     5,   165,   165,
+     196,   165,     7,   165,   196,   165,   165,   165,   165,   165,
+     165,   165,   165,   165,   165,   165,   165,   165,   165,   185,
+     165,   165,   165,    17,   131,   486,   132,   133,   134,   135,
+     136,   168,   493,   165,   165,   165,     5,     5,   185,   209,
+     519,   511,   222,    23,   239,   240,   241,    33,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,   200,   251,   252,   253,   256,   258,   260,
+     262,   263,   265,   266,   267,   268,   269,   270,   271,   272,
+     274,   276,   277,   251,     7,   247,   248,   249,     7,   313,
+     314,   315,     7,   351,   352,   353,     7,   375,   376,   377,
+       7,   341,   342,   343,    93,    94,    95,    96,    98,   280,
+     281,   282,   283,   284,   285,   286,     7,   447,   448,     7,
+     409,   410,   411,     7,   289,   290,   291,   106,   107,   108,
+     109,   110,   111,   303,   304,   305,   306,   307,   308,   309,
+     310,   114,   115,   200,   403,   405,   460,   461,   462,   464,
+     472,   197,     7,   393,   394,   395,   101,   424,   426,   444,
+       7,   523,   524,   247,     8,     8,     8,     8,   242,     3,
+       8,   254,   257,   259,   261,     4,     4,     4,     4,     4,
+     273,   275,     4,     4,     4,     4,     4,     3,     8,     8,
+     250,     6,     3,   316,     6,     3,   354,     6,     3,   378,
+       6,     3,   344,     6,     3,     3,     6,   449,     3,     6,
+     412,     6,     3,   292,     6,     3,     4,     4,     4,     4,
+       4,     4,     3,     8,   463,   465,     3,     8,     8,   165,
+     198,   199,   396,     6,     3,   427,     8,   525,     3,     6,
+       6,     4,   240,     4,     4,     4,     4,   166,   168,   166,
+     168,   166,     4,     4,   166,   166,   166,   166,   168,   252,
+     251,   249,   319,   315,   357,   353,   381,   377,   200,   211,
+     212,   213,   218,   219,   263,   311,   329,   331,   333,   335,
+     345,   346,   373,   403,   405,   418,   420,   422,   442,   343,
+     281,    89,    90,   200,   263,   347,   373,   403,   405,   418,
+     420,   422,   450,   451,   452,   453,   454,   456,   448,   415,
+     411,   295,   291,   166,   166,   166,   166,   166,   166,   304,
+       4,     4,   461,     6,     3,   399,   395,     4,   141,   143,
+     144,   200,   263,   403,   405,   526,   527,   528,   529,   531,
+     524,   165,    34,    35,    36,    37,   255,   165,   165,   165,
+     165,   165,     8,     8,     8,     8,     3,     8,   455,     4,
+       8,     3,     8,     8,   165,   165,   165,     8,   196,   532,
+       4,   530,     3,     8,   346,     4,   168,   452,     4,   166,
+       4,   527,   165,     5,   165,     7,   533,   534,   535,     3,
+       6,   142,   145,   146,   147,   536,   537,   538,   540,   541,
+     542,   534,   539,     4,     4,     4,     3,     8,     4,   168,
+     166,   166,   537,   165
   };
 
   const unsigned short
@@ -4566,61 +4568,61 @@ namespace isc { namespace dhcp {
      208,   207,   209,   209,   210,   210,   210,   210,   210,   210,
      210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
      210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
-     210,   210,   210,   210,   210,   210,   210,   211,   212,   213,
-     214,   216,   215,   217,   218,   219,   221,   220,   222,   222,
-     223,   223,   223,   223,   223,   223,   223,   225,   224,   227,
-     226,   229,   228,   230,   230,   232,   231,   233,   233,   234,
-     236,   235,   238,   237,   239,   239,   240,   242,   241,   244,
-     243,   246,   245,   247,   247,   248,   248,   250,   249,   251,
-     251,   252,   252,   252,   252,   252,   252,   252,   252,   252,
-     252,   252,   252,   252,   252,   252,   252,   252,   252,   254,
-     253,   255,   255,   255,   255,   257,   256,   259,   258,   261,
-     260,   262,   264,   263,   265,   266,   267,   268,   269,   270,
-     271,   273,   272,   275,   274,   276,   277,   279,   278,   280,
-     280,   281,   281,   281,   281,   281,   282,   283,   284,   285,
-     286,   288,   287,   289,   289,   290,   290,   292,   291,   294,
-     293,   295,   295,   295,   296,   296,   298,   297,   300,   299,
-     302,   301,   303,   303,   304,   304,   304,   304,   304,   304,
-     305,   306,   307,   308,   309,   310,   312,   311,   313,   313,
-     314,   314,   316,   315,   318,   317,   319,   319,   320,   320,
+     210,   210,   210,   210,   210,   210,   210,   210,   211,   212,
+     213,   214,   216,   215,   217,   218,   219,   221,   220,   222,
+     222,   223,   223,   223,   223,   223,   223,   223,   225,   224,
+     227,   226,   229,   228,   230,   230,   232,   231,   233,   233,
+     234,   236,   235,   238,   237,   239,   239,   240,   242,   241,
+     244,   243,   246,   245,   247,   247,   248,   248,   250,   249,
+     251,   251,   252,   252,   252,   252,   252,   252,   252,   252,
+     252,   252,   252,   252,   252,   252,   252,   252,   252,   252,
+     254,   253,   255,   255,   255,   255,   257,   256,   259,   258,
+     261,   260,   262,   264,   263,   265,   266,   267,   268,   269,
+     270,   271,   273,   272,   275,   274,   276,   277,   279,   278,
+     280,   280,   281,   281,   281,   281,   281,   282,   283,   284,
+     285,   286,   288,   287,   289,   289,   290,   290,   292,   291,
+     294,   293,   295,   295,   295,   296,   296,   298,   297,   300,
+     299,   302,   301,   303,   303,   304,   304,   304,   304,   304,
+     304,   305,   306,   307,   308,   309,   310,   312,   311,   313,
+     313,   314,   314,   316,   315,   318,   317,   319,   319,   320,
      320,   320,   320,   320,   320,   320,   320,   320,   320,   320,
      320,   320,   320,   320,   320,   320,   320,   320,   320,   320,
-     320,   320,   322,   321,   324,   323,   326,   325,   328,   327,
-     330,   329,   332,   331,   334,   333,   336,   335,   337,   337,
-     337,   337,   338,   340,   339,   341,   341,   342,   342,   344,
-     343,   345,   345,   346,   346,   346,   346,   346,   346,   346,
+     320,   320,   320,   322,   321,   324,   323,   326,   325,   328,
+     327,   330,   329,   332,   331,   334,   333,   336,   335,   337,
+     337,   337,   337,   338,   340,   339,   341,   341,   342,   342,
+     344,   343,   345,   345,   346,   346,   346,   346,   346,   346,
      346,   346,   346,   346,   346,   346,   346,   346,   346,   346,
-     346,   346,   348,   347,   350,   349,   351,   351,   352,   352,
-     354,   353,   356,   355,   357,   357,   358,   358,   359,   359,
-     359,   359,   359,   359,   359,   359,   359,   359,   360,   361,
-     362,   364,   363,   366,   365,   368,   367,   369,   371,   370,
-     372,   374,   373,   375,   375,   376,   376,   378,   377,   380,
-     379,   381,   381,   382,   382,   383,   383,   383,   383,   383,
-     383,   383,   383,   383,   384,   386,   385,   387,   388,   389,
-     390,   392,   391,   393,   393,   394,   394,   396,   395,   398,
-     397,   399,   399,   400,   400,   400,   400,   400,   400,   400,
-     402,   401,   404,   403,   406,   405,   408,   407,   409,   409,
-     410,   410,   412,   411,   414,   413,   415,   415,   416,   416,
-     417,   417,   417,   417,   417,   417,   417,   417,   417,   417,
-     417,   417,   417,   417,   417,   419,   418,   421,   420,   423,
-     422,   425,   424,   427,   426,   429,   428,   431,   430,   433,
-     432,   435,   434,   437,   436,   439,   438,   441,   440,   443,
-     442,   444,   444,   446,   445,   447,   447,   449,   448,   450,
-     450,   451,   451,   452,   452,   452,   452,   452,   452,   452,
-     452,   452,   452,   452,   453,   455,   454,   456,   457,   459,
-     458,   460,   460,   461,   461,   461,   461,   461,   463,   462,
-     465,   464,   467,   466,   469,   468,   471,   470,   472,   472,
-     473,   473,   473,   473,   473,   473,   473,   473,   473,   473,
-     473,   473,   473,   473,   473,   473,   473,   473,   474,   476,
-     475,   478,   477,   479,   481,   480,   482,   483,   485,   484,
-     486,   486,   488,   487,   489,   490,   492,   491,   493,   493,
-     493,   493,   493,   495,   494,   497,   496,   499,   498,   501,
-     500,   503,   502,   505,   504,   507,   506,   508,   506,   510,
-     509,   511,   511,   512,   512,   514,   513,   516,   515,   518,
-     517,   519,   519,   520,   522,   521,   523,   523,   525,   524,
-     526,   526,   527,   527,   527,   527,   527,   527,   527,   528,
-     530,   529,   532,   531,   533,   533,   535,   534,   536,   536,
-     537,   537,   537,   537,   539,   538,   540,   541,   542
+     346,   346,   346,   348,   347,   350,   349,   351,   351,   352,
+     352,   354,   353,   356,   355,   357,   357,   358,   358,   359,
+     359,   359,   359,   359,   359,   359,   359,   359,   359,   360,
+     361,   362,   364,   363,   366,   365,   368,   367,   369,   371,
+     370,   372,   374,   373,   375,   375,   376,   376,   378,   377,
+     380,   379,   381,   381,   382,   382,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   384,   386,   385,   387,   388,
+     389,   390,   392,   391,   393,   393,   394,   394,   396,   395,
+     398,   397,   399,   399,   400,   400,   400,   400,   400,   400,
+     400,   402,   401,   404,   403,   406,   405,   408,   407,   409,
+     409,   410,   410,   412,   411,   414,   413,   415,   415,   416,
+     416,   417,   417,   417,   417,   417,   417,   417,   417,   417,
+     417,   417,   417,   417,   417,   417,   419,   418,   421,   420,
+     423,   422,   425,   424,   427,   426,   429,   428,   431,   430,
+     433,   432,   435,   434,   437,   436,   439,   438,   441,   440,
+     443,   442,   444,   444,   446,   445,   447,   447,   449,   448,
+     450,   450,   451,   451,   452,   452,   452,   452,   452,   452,
+     452,   452,   452,   452,   452,   453,   455,   454,   456,   457,
+     459,   458,   460,   460,   461,   461,   461,   461,   461,   463,
+     462,   465,   464,   467,   466,   469,   468,   471,   470,   472,
+     472,   473,   473,   473,   473,   473,   473,   473,   473,   473,
+     473,   473,   473,   473,   473,   473,   473,   473,   473,   474,
+     476,   475,   478,   477,   479,   481,   480,   482,   483,   485,
+     484,   486,   486,   488,   487,   489,   490,   492,   491,   493,
+     493,   493,   493,   493,   495,   494,   497,   496,   499,   498,
+     501,   500,   503,   502,   505,   504,   507,   506,   508,   506,
+     510,   509,   511,   511,   512,   512,   514,   513,   516,   515,
+     518,   517,   519,   519,   520,   522,   521,   523,   523,   525,
+     524,   526,   526,   527,   527,   527,   527,   527,   527,   527,
+     528,   530,   529,   532,   531,   533,   533,   535,   534,   536,
+     536,   537,   537,   537,   537,   539,   538,   540,   541,   542
   };
 
   const unsigned char
@@ -4636,61 +4638,61 @@ namespace isc { namespace dhcp {
        0,     4,     1,     3,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     3,     3,     3,
-       3,     0,     4,     3,     3,     3,     0,     6,     1,     3,
-       1,     1,     1,     1,     1,     1,     1,     0,     4,     0,
-       4,     0,     4,     1,     1,     0,     4,     1,     1,     3,
-       0,     6,     0,     6,     1,     3,     1,     0,     4,     0,
-       6,     0,     6,     0,     1,     1,     3,     0,     4,     1,
-       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       4,     1,     1,     1,     1,     0,     4,     0,     4,     0,
-       4,     3,     0,     4,     3,     3,     3,     3,     3,     3,
-       3,     0,     4,     0,     4,     3,     3,     0,     6,     1,
-       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     0,     6,     0,     1,     1,     3,     0,     4,     0,
-       4,     1,     3,     1,     1,     1,     0,     4,     0,     4,
-       0,     6,     1,     3,     1,     1,     1,     1,     1,     1,
-       3,     3,     3,     3,     3,     3,     0,     6,     0,     1,
-       1,     3,     0,     4,     0,     4,     1,     3,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     3,
+       3,     3,     0,     4,     3,     3,     3,     0,     6,     1,
+       3,     1,     1,     1,     1,     1,     1,     1,     0,     4,
+       0,     4,     0,     4,     1,     1,     0,     4,     1,     1,
+       3,     0,     6,     0,     6,     1,     3,     1,     0,     4,
+       0,     6,     0,     6,     0,     1,     1,     3,     0,     4,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       0,     4,     1,     1,     1,     1,     0,     4,     0,     4,
+       0,     4,     3,     0,     4,     3,     3,     3,     3,     3,
+       3,     3,     0,     4,     0,     4,     3,     3,     0,     6,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     0,     6,     0,     1,     1,     3,     0,     4,
+       0,     4,     1,     3,     1,     1,     1,     0,     4,     0,
+       4,     0,     6,     1,     3,     1,     1,     1,     1,     1,
+       1,     3,     3,     3,     3,     3,     3,     0,     6,     0,
+       1,     1,     3,     0,     4,     0,     4,     1,     3,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     4,     0,     4,     0,     4,     0,     4,
-       0,     4,     0,     4,     0,     4,     0,     4,     1,     1,
-       1,     1,     3,     0,     6,     0,     1,     1,     3,     0,
-       4,     1,     3,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     6,     0,     4,     0,     1,     1,     3,
-       0,     4,     0,     4,     0,     1,     1,     3,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
-       1,     0,     4,     0,     4,     0,     4,     1,     0,     4,
-       3,     0,     6,     0,     1,     1,     3,     0,     4,     0,
-       4,     0,     1,     1,     3,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     4,     1,     1,     3,
-       3,     0,     6,     0,     1,     1,     3,     0,     4,     0,
-       4,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       0,     4,     0,     4,     0,     4,     0,     6,     0,     1,
-       1,     3,     0,     4,     0,     4,     0,     1,     1,     3,
+       1,     1,     1,     0,     4,     0,     4,     0,     4,     0,
+       4,     0,     4,     0,     4,     0,     4,     0,     4,     1,
+       1,     1,     1,     3,     0,     6,     0,     1,     1,     3,
+       0,     4,     1,     3,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     4,     0,     4,     0,
-       4,     0,     4,     0,     4,     0,     4,     0,     4,     0,
-       4,     0,     4,     0,     4,     0,     4,     0,     4,     0,
-       6,     1,     1,     0,     6,     1,     3,     0,     4,     0,
-       1,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     4,     3,     3,     0,
-       6,     1,     3,     1,     1,     1,     1,     1,     0,     4,
-       0,     4,     0,     4,     0,     6,     0,     4,     1,     3,
+       1,     1,     1,     0,     6,     0,     4,     0,     1,     1,
+       3,     0,     4,     0,     4,     0,     1,     1,     3,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     3,     0,
-       4,     0,     4,     3,     0,     4,     3,     3,     0,     4,
-       1,     1,     0,     4,     3,     3,     0,     4,     1,     1,
-       1,     1,     1,     0,     4,     0,     4,     0,     4,     0,
-       4,     0,     4,     0,     4,     0,     4,     0,     6,     0,
-       4,     1,     3,     1,     1,     0,     6,     0,     6,     0,
-       4,     1,     3,     1,     0,     6,     1,     3,     0,     4,
-       1,     3,     1,     1,     1,     1,     1,     1,     1,     3,
-       0,     4,     0,     6,     1,     3,     0,     4,     1,     3,
-       1,     1,     1,     1,     0,     4,     3,     3,     3
+       3,     1,     0,     4,     0,     4,     0,     4,     1,     0,
+       4,     3,     0,     6,     0,     1,     1,     3,     0,     4,
+       0,     4,     0,     1,     1,     3,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     0,     4,     1,     1,
+       3,     3,     0,     6,     0,     1,     1,     3,     0,     4,
+       0,     4,     1,     3,     1,     1,     1,     1,     1,     1,
+       1,     0,     4,     0,     4,     0,     4,     0,     6,     0,
+       1,     1,     3,     0,     4,     0,     4,     0,     1,     1,
+       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     0,     4,     0,     4,
+       0,     4,     0,     4,     0,     4,     0,     4,     0,     4,
+       0,     4,     0,     4,     0,     4,     0,     4,     0,     4,
+       0,     6,     1,     1,     0,     6,     1,     3,     0,     4,
+       0,     1,     1,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     0,     4,     3,     3,
+       0,     6,     1,     3,     1,     1,     1,     1,     1,     0,
+       4,     0,     4,     0,     4,     0,     6,     0,     4,     1,
+       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
+       0,     4,     0,     4,     3,     0,     4,     3,     3,     0,
+       4,     1,     1,     0,     4,     3,     3,     0,     4,     1,
+       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
+       0,     4,     0,     4,     0,     4,     0,     4,     0,     6,
+       0,     4,     1,     3,     1,     1,     0,     6,     0,     6,
+       0,     4,     1,     3,     1,     0,     6,     1,     3,     0,
+       4,     1,     3,     1,     1,     1,     1,     1,     1,     1,
+       3,     0,     4,     0,     6,     1,     3,     0,     4,     1,
+       3,     1,     1,     1,     1,     0,     4,     3,     3,     3
   };
 
 
@@ -4853,61 +4855,61 @@ namespace isc { namespace dhcp {
      420,   420,   429,   430,   435,   436,   437,   438,   439,   440,
      441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
      451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,   464,   465,   466,   467,   470,   475,   480,
-     485,   490,   490,   498,   503,   508,   514,   514,   525,   526,
-     529,   530,   531,   532,   533,   534,   535,   538,   538,   547,
-     547,   557,   557,   564,   565,   568,   568,   575,   577,   581,
-     587,   587,   599,   599,   609,   610,   612,   614,   614,   632,
-     632,   644,   644,   654,   655,   658,   659,   662,   662,   672,
-     673,   676,   677,   678,   679,   680,   681,   682,   683,   684,
-     685,   686,   687,   688,   689,   690,   691,   692,   693,   696,
-     696,   703,   704,   705,   706,   709,   709,   717,   717,   725,
-     725,   733,   738,   738,   746,   751,   756,   761,   766,   771,
-     776,   781,   781,   789,   789,   797,   802,   807,   807,   817,
-     818,   821,   822,   823,   824,   825,   828,   833,   838,   843,
-     848,   853,   853,   863,   864,   867,   868,   871,   871,   881,
-     881,   891,   892,   893,   896,   897,   900,   900,   908,   908,
-     916,   916,   927,   928,   931,   932,   933,   934,   935,   936,
-     939,   944,   949,   954,   959,   964,   972,   972,   985,   986,
-     989,   990,   997,   997,  1023,  1023,  1034,  1035,  1039,  1040,
+     461,   462,   463,   464,   465,   466,   467,   468,   471,   476,
+     481,   486,   491,   491,   499,   504,   509,   515,   515,   526,
+     527,   530,   531,   532,   533,   534,   535,   536,   539,   539,
+     548,   548,   558,   558,   565,   566,   569,   569,   576,   578,
+     582,   588,   588,   600,   600,   610,   611,   613,   615,   615,
+     633,   633,   645,   645,   655,   656,   659,   660,   663,   663,
+     673,   674,   677,   678,   679,   680,   681,   682,   683,   684,
+     685,   686,   687,   688,   689,   690,   691,   692,   693,   694,
+     697,   697,   704,   705,   706,   707,   710,   710,   718,   718,
+     726,   726,   734,   739,   739,   747,   752,   757,   762,   767,
+     772,   777,   782,   782,   790,   790,   798,   803,   808,   808,
+     818,   819,   822,   823,   824,   825,   826,   829,   834,   839,
+     844,   849,   854,   854,   864,   865,   868,   869,   872,   872,
+     882,   882,   892,   893,   894,   897,   898,   901,   901,   909,
+     909,   917,   917,   928,   929,   932,   933,   934,   935,   936,
+     937,   940,   945,   950,   955,   960,   965,   973,   973,   986,
+     987,   990,   991,   998,   998,  1024,  1024,  1035,  1036,  1040,
     1041,  1042,  1043,  1044,  1045,  1046,  1047,  1048,  1049,  1050,
     1051,  1052,  1053,  1054,  1055,  1056,  1057,  1058,  1059,  1060,
-    1061,  1062,  1065,  1065,  1073,  1073,  1081,  1081,  1089,  1089,
-    1097,  1097,  1105,  1105,  1113,  1113,  1123,  1123,  1130,  1131,
-    1132,  1133,  1136,  1143,  1143,  1154,  1155,  1159,  1160,  1163,
-    1163,  1171,  1172,  1175,  1176,  1177,  1178,  1179,  1180,  1181,
+    1061,  1062,  1063,  1066,  1066,  1074,  1074,  1082,  1082,  1090,
+    1090,  1098,  1098,  1106,  1106,  1114,  1114,  1124,  1124,  1131,
+    1132,  1133,  1134,  1137,  1144,  1144,  1155,  1156,  1160,  1161,
+    1164,  1164,  1172,  1173,  1176,  1177,  1178,  1179,  1180,  1181,
     1182,  1183,  1184,  1185,  1186,  1187,  1188,  1189,  1190,  1191,
-    1192,  1193,  1200,  1200,  1213,  1213,  1222,  1223,  1226,  1227,
-    1232,  1232,  1247,  1247,  1261,  1262,  1265,  1266,  1269,  1270,
-    1271,  1272,  1273,  1274,  1275,  1276,  1277,  1278,  1281,  1283,
-    1288,  1290,  1290,  1298,  1298,  1306,  1306,  1314,  1316,  1316,
-    1324,  1333,  1333,  1345,  1346,  1351,  1352,  1357,  1357,  1369,
-    1369,  1381,  1382,  1387,  1388,  1393,  1394,  1395,  1396,  1397,
-    1398,  1399,  1400,  1401,  1404,  1406,  1406,  1414,  1416,  1418,
-    1423,  1431,  1431,  1443,  1444,  1447,  1448,  1451,  1451,  1461,
-    1461,  1471,  1472,  1475,  1476,  1477,  1478,  1479,  1480,  1481,
-    1484,  1484,  1492,  1492,  1517,  1517,  1547,  1547,  1557,  1558,
-    1561,  1562,  1565,  1565,  1574,  1574,  1583,  1584,  1587,  1588,
-    1592,  1593,  1594,  1595,  1596,  1597,  1598,  1599,  1600,  1601,
-    1602,  1603,  1604,  1605,  1606,  1609,  1609,  1617,  1617,  1625,
-    1625,  1633,  1633,  1641,  1641,  1651,  1651,  1659,  1659,  1667,
-    1667,  1675,  1675,  1683,  1683,  1691,  1691,  1699,  1699,  1712,
-    1712,  1722,  1723,  1729,  1729,  1739,  1740,  1743,  1743,  1753,
-    1754,  1757,  1758,  1761,  1762,  1763,  1764,  1765,  1766,  1767,
-    1768,  1769,  1770,  1771,  1774,  1776,  1776,  1784,  1793,  1800,
-    1800,  1810,  1811,  1814,  1815,  1816,  1817,  1818,  1821,  1821,
-    1829,  1829,  1840,  1840,  1858,  1858,  1870,  1870,  1880,  1881,
-    1884,  1885,  1886,  1887,  1888,  1889,  1890,  1891,  1892,  1893,
-    1894,  1895,  1896,  1897,  1898,  1899,  1900,  1901,  1904,  1909,
-    1909,  1917,  1917,  1925,  1930,  1930,  1938,  1943,  1948,  1948,
-    1956,  1957,  1960,  1960,  1968,  1973,  1978,  1978,  1986,  1989,
-    1992,  1995,  1998,  2004,  2004,  2012,  2012,  2020,  2020,  2031,
-    2031,  2038,  2038,  2045,  2045,  2052,  2052,  2061,  2061,  2072,
-    2072,  2082,  2083,  2087,  2088,  2091,  2091,  2106,  2106,  2116,
-    2116,  2127,  2128,  2132,  2136,  2136,  2148,  2149,  2153,  2153,
-    2161,  2162,  2165,  2166,  2167,  2168,  2169,  2170,  2171,  2174,
-    2179,  2179,  2187,  2187,  2197,  2198,  2201,  2201,  2209,  2210,
-    2213,  2214,  2215,  2216,  2219,  2219,  2227,  2232,  2237
+    1192,  1193,  1194,  1201,  1201,  1214,  1214,  1223,  1224,  1227,
+    1228,  1233,  1233,  1248,  1248,  1262,  1263,  1266,  1267,  1270,
+    1271,  1272,  1273,  1274,  1275,  1276,  1277,  1278,  1279,  1282,
+    1284,  1289,  1291,  1291,  1299,  1299,  1307,  1307,  1315,  1317,
+    1317,  1325,  1334,  1334,  1346,  1347,  1352,  1353,  1358,  1358,
+    1370,  1370,  1382,  1383,  1388,  1389,  1394,  1395,  1396,  1397,
+    1398,  1399,  1400,  1401,  1402,  1405,  1407,  1407,  1415,  1417,
+    1419,  1424,  1432,  1432,  1444,  1445,  1448,  1449,  1452,  1452,
+    1462,  1462,  1472,  1473,  1476,  1477,  1478,  1479,  1480,  1481,
+    1482,  1485,  1485,  1493,  1493,  1518,  1518,  1548,  1548,  1558,
+    1559,  1562,  1563,  1566,  1566,  1575,  1575,  1584,  1585,  1588,
+    1589,  1593,  1594,  1595,  1596,  1597,  1598,  1599,  1600,  1601,
+    1602,  1603,  1604,  1605,  1606,  1607,  1610,  1610,  1618,  1618,
+    1626,  1626,  1634,  1634,  1642,  1642,  1652,  1652,  1660,  1660,
+    1668,  1668,  1676,  1676,  1684,  1684,  1692,  1692,  1700,  1700,
+    1713,  1713,  1723,  1724,  1730,  1730,  1740,  1741,  1744,  1744,
+    1754,  1755,  1758,  1759,  1762,  1763,  1764,  1765,  1766,  1767,
+    1768,  1769,  1770,  1771,  1772,  1775,  1777,  1777,  1785,  1794,
+    1801,  1801,  1811,  1812,  1815,  1816,  1817,  1818,  1819,  1822,
+    1822,  1830,  1830,  1841,  1841,  1859,  1859,  1871,  1871,  1881,
+    1882,  1885,  1886,  1887,  1888,  1889,  1890,  1891,  1892,  1893,
+    1894,  1895,  1896,  1897,  1898,  1899,  1900,  1901,  1902,  1905,
+    1910,  1910,  1918,  1918,  1926,  1931,  1931,  1939,  1944,  1949,
+    1949,  1957,  1958,  1961,  1961,  1969,  1974,  1979,  1979,  1987,
+    1990,  1993,  1996,  1999,  2005,  2005,  2013,  2013,  2021,  2021,
+    2032,  2032,  2039,  2039,  2046,  2046,  2053,  2053,  2062,  2062,
+    2073,  2073,  2083,  2084,  2088,  2089,  2092,  2092,  2107,  2107,
+    2117,  2117,  2128,  2129,  2133,  2137,  2137,  2149,  2150,  2154,
+    2154,  2162,  2163,  2166,  2167,  2168,  2169,  2170,  2171,  2172,
+    2175,  2180,  2180,  2188,  2188,  2198,  2199,  2202,  2202,  2210,
+    2211,  2214,  2215,  2216,  2217,  2220,  2220,  2228,  2233,  2238
   };
 
   // Print the state stack on the debug stream.
@@ -4942,8 +4944,8 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp4_parser.yy" // lalr1.cc:1218
 } } // isc::dhcp
-#line 4946 "dhcp4_parser.cc" // lalr1.cc:1218
-#line 2242 "dhcp4_parser.yy" // lalr1.cc:1219
+#line 4948 "dhcp4_parser.cc" // lalr1.cc:1218
+#line 2243 "dhcp4_parser.yy" // lalr1.cc:1219
 
 
 void
diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h
index f2673a3f1d..f3905efaef 100644
--- a/src/bin/dhcp4/dhcp4_parser.h
+++ b/src/bin/dhcp4/dhcp4_parser.h
@@ -1693,7 +1693,7 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 998,     ///< Last index in yytable_.
+      yylast_ = 1005,     ///< Last index in yytable_.
       yynnts_ = 374,  ///< Number of nonterminal symbols.
       yyfinal_ = 30, ///< Termination state number.
       yyterror_ = 1,
diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh
index a764734d3f..bf20acebfc 100644
--- a/src/bin/dhcp4/location.hh
+++ b/src/bin/dhcp4/location.hh
@@ -1,4 +1,4 @@
-// Generated 201811201350
+// Generated 201811201411
 // A Bison parser, made by GNU Bison 3.2.1.
 
 // Locations for Bison parsers in C++
diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh
index 3d9dbf9cde..4a9a456ce0 100644
--- a/src/bin/dhcp4/position.hh
+++ b/src/bin/dhcp4/position.hh
@@ -1,4 +1,4 @@
-// Generated 201811201350
+// Generated 201811201411
 // A Bison parser, made by GNU Bison 3.2.1.
 
 // Starting with Bison 3.2, this file is useless: the structure it
diff --git a/src/bin/dhcp4/stack.hh b/src/bin/dhcp4/stack.hh
index 0575d1aa94..8d96cdf2b7 100644
--- a/src/bin/dhcp4/stack.hh
+++ b/src/bin/dhcp4/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201811201350
+// Generated 201811201411
 // A Bison parser, made by GNU Bison 3.2.1.
 
 // Starting with Bison 3.2, this file is useless: the structure it
diff --git a/src/bin/dhcp6/dhcp6_lexer.cc b/src/bin/dhcp6/dhcp6_lexer.cc
index 47ea39eccb..06d6403b46 100644
--- a/src/bin/dhcp6/dhcp6_lexer.cc
+++ b/src/bin/dhcp6/dhcp6_lexer.cc
@@ -1677,16 +1677,16 @@ static const flex_int16_t yy_rule_linenum[179] =
       661,  672,  683,  694,  705,  716,  727,  738,  749,  760,
       771,  782,  791,  800,  810,  819,  828,  843,  859,  868,
       877,  886,  895,  904,  913,  922,  931,  940,  949,  971,
-      993, 1002, 1012, 1022, 1031, 1041, 1051, 1060, 1069, 1078,
-
-     1087, 1096, 1106, 1115, 1124, 1133, 1142, 1151, 1160, 1169,
-     1178, 1187, 1197, 1206, 1215, 1225, 1237, 1250, 1259, 1268,
-     1278, 1288, 1297, 1308, 1318, 1327, 1337, 1347, 1356, 1365,
-     1374, 1383, 1393, 1402, 1412, 1421, 1430, 1439, 1448, 1457,
-     1466, 1475, 1484, 1493, 1502, 1511, 1520, 1529, 1538, 1547,
-     1556, 1565, 1574, 1583, 1592, 1601, 1610, 1619, 1628, 1637,
-     1647, 1746, 1751, 1756, 1761, 1762, 1763, 1764, 1765, 1766,
-     1768, 1786, 1799, 1804, 1808, 1810, 1812, 1814
+      993, 1002, 1012, 1022, 1031, 1041, 1052, 1061, 1070, 1079,
+
+     1088, 1097, 1107, 1116, 1125, 1134, 1143, 1152, 1161, 1170,
+     1179, 1188, 1198, 1207, 1216, 1226, 1238, 1251, 1260, 1269,
+     1279, 1289, 1298, 1309, 1319, 1328, 1338, 1348, 1357, 1366,
+     1375, 1384, 1394, 1403, 1413, 1422, 1431, 1440, 1449, 1458,
+     1467, 1476, 1485, 1494, 1503, 1512, 1521, 1530, 1539, 1548,
+     1557, 1566, 1575, 1584, 1593, 1602, 1611, 1620, 1629, 1638,
+     1648, 1747, 1752, 1757, 1762, 1763, 1764, 1765, 1766, 1767,
+     1769, 1787, 1800, 1805, 1809, 1811, 1813, 1815
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -3366,6 +3366,7 @@ YY_RULE_SETUP
 #line 1041 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
+    case isc::dhcp::Parser6Context::DHCP6:
     case isc::dhcp::Parser6Context::SUBNET6:
     case isc::dhcp::Parser6Context::SHARED_NETWORK:
         return isc::dhcp::Dhcp6Parser::make_RESERVATION_MODE(driver.loc_);
@@ -3376,7 +3377,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 1051 "dhcp6_lexer.ll"
+#line 1052 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3388,7 +3389,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 1060 "dhcp6_lexer.ll"
+#line 1061 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3400,7 +3401,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 1069 "dhcp6_lexer.ll"
+#line 1070 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3412,7 +3413,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 1078 "dhcp6_lexer.ll"
+#line 1079 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3424,7 +3425,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 1087 "dhcp6_lexer.ll"
+#line 1088 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3436,7 +3437,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 1096 "dhcp6_lexer.ll"
+#line 1097 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3449,7 +3450,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 1106 "dhcp6_lexer.ll"
+#line 1107 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3461,7 +3462,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 1115 "dhcp6_lexer.ll"
+#line 1116 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3473,7 +3474,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 1124 "dhcp6_lexer.ll"
+#line 1125 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3485,7 +3486,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 1133 "dhcp6_lexer.ll"
+#line 1134 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -3497,7 +3498,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 1142 "dhcp6_lexer.ll"
+#line 1143 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGING:
@@ -3509,7 +3510,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 1151 "dhcp6_lexer.ll"
+#line 1152 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGERS:
@@ -3521,7 +3522,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 1160 "dhcp6_lexer.ll"
+#line 1161 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3533,7 +3534,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 1169 "dhcp6_lexer.ll"
+#line 1170 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3545,7 +3546,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 1178 "dhcp6_lexer.ll"
+#line 1179 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3557,7 +3558,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 1187 "dhcp6_lexer.ll"
+#line 1188 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3569,7 +3570,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 1197 "dhcp6_lexer.ll"
+#line 1198 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGERS:
@@ -3581,7 +3582,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 1206 "dhcp6_lexer.ll"
+#line 1207 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGERS:
@@ -3593,7 +3594,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 1215 "dhcp6_lexer.ll"
+#line 1216 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3606,7 +3607,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 1225 "dhcp6_lexer.ll"
+#line 1226 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3621,7 +3622,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 1237 "dhcp6_lexer.ll"
+#line 1238 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3637,7 +3638,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 1250 "dhcp6_lexer.ll"
+#line 1251 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CLIENT_CLASSES:
@@ -3649,7 +3650,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 1259 "dhcp6_lexer.ll"
+#line 1260 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CLIENT_CLASSES:
@@ -3661,7 +3662,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 1268 "dhcp6_lexer.ll"
+#line 1269 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3674,7 +3675,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 1278 "dhcp6_lexer.ll"
+#line 1279 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -3687,7 +3688,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 1288 "dhcp6_lexer.ll"
+#line 1289 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -3699,7 +3700,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 1297 "dhcp6_lexer.ll"
+#line 1298 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::MAC_SOURCES:
@@ -3713,7 +3714,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 1308 "dhcp6_lexer.ll"
+#line 1309 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3726,7 +3727,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 1318 "dhcp6_lexer.ll"
+#line 1319 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -3738,7 +3739,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 1327 "dhcp6_lexer.ll"
+#line 1328 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3751,7 +3752,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 1337 "dhcp6_lexer.ll"
+#line 1338 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3764,7 +3765,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 1347 "dhcp6_lexer.ll"
+#line 1348 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DATA:
@@ -3776,7 +3777,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 1356 "dhcp6_lexer.ll"
+#line 1357 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3788,7 +3789,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 1365 "dhcp6_lexer.ll"
+#line 1366 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3800,7 +3801,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 1374 "dhcp6_lexer.ll"
+#line 1375 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3812,7 +3813,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 1383 "dhcp6_lexer.ll"
+#line 1384 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3825,7 +3826,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 1393 "dhcp6_lexer.ll"
+#line 1394 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RELAY:
@@ -3837,7 +3838,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 1402 "dhcp6_lexer.ll"
+#line 1403 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3849,7 +3850,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 1412 "dhcp6_lexer.ll"
+#line 1413 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOOKS_LIBRARIES:
@@ -3861,7 +3862,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 1421 "dhcp6_lexer.ll"
+#line 1422 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOOKS_LIBRARIES:
@@ -3873,7 +3874,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 1430 "dhcp6_lexer.ll"
+#line 1431 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3885,7 +3886,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 1439 "dhcp6_lexer.ll"
+#line 1440 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -3897,7 +3898,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 1448 "dhcp6_lexer.ll"
+#line 1449 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -3909,7 +3910,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 1457 "dhcp6_lexer.ll"
+#line 1458 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -3921,7 +3922,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 1466 "dhcp6_lexer.ll"
+#line 1467 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -3933,7 +3934,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 1475 "dhcp6_lexer.ll"
+#line 1476 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -3945,7 +3946,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 1484 "dhcp6_lexer.ll"
+#line 1485 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -3957,7 +3958,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 1493 "dhcp6_lexer.ll"
+#line 1494 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -3969,7 +3970,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 1502 "dhcp6_lexer.ll"
+#line 1503 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3981,7 +3982,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 1511 "dhcp6_lexer.ll"
+#line 1512 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -3993,7 +3994,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 1520 "dhcp6_lexer.ll"
+#line 1521 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4005,7 +4006,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 1529 "dhcp6_lexer.ll"
+#line 1530 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4017,7 +4018,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 1538 "dhcp6_lexer.ll"
+#line 1539 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4029,7 +4030,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 1547 "dhcp6_lexer.ll"
+#line 1548 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4041,7 +4042,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 1556 "dhcp6_lexer.ll"
+#line 1557 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4053,7 +4054,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 1565 "dhcp6_lexer.ll"
+#line 1566 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4065,7 +4066,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 1574 "dhcp6_lexer.ll"
+#line 1575 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4077,7 +4078,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 1583 "dhcp6_lexer.ll"
+#line 1584 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -4089,7 +4090,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 1592 "dhcp6_lexer.ll"
+#line 1593 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -4101,7 +4102,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 1601 "dhcp6_lexer.ll"
+#line 1602 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4113,7 +4114,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 1610 "dhcp6_lexer.ll"
+#line 1611 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4125,7 +4126,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 1619 "dhcp6_lexer.ll"
+#line 1620 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -4137,7 +4138,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 1628 "dhcp6_lexer.ll"
+#line 1629 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -4149,7 +4150,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 1637 "dhcp6_lexer.ll"
+#line 1638 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -4161,7 +4162,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 1647 "dhcp6_lexer.ll"
+#line 1648 "dhcp6_lexer.ll"
 {
     /* A string has been matched. It contains the actual string and single quotes.
        We need to get those quotes out of the way and just use its content, e.g.
@@ -4264,7 +4265,7 @@ YY_RULE_SETUP
 case 162:
 /* rule 162 can match eol */
 YY_RULE_SETUP
-#line 1746 "dhcp6_lexer.ll"
+#line 1747 "dhcp6_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
@@ -4273,7 +4274,7 @@ YY_RULE_SETUP
 case 163:
 /* rule 163 can match eol */
 YY_RULE_SETUP
-#line 1751 "dhcp6_lexer.ll"
+#line 1752 "dhcp6_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
@@ -4281,7 +4282,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 1756 "dhcp6_lexer.ll"
+#line 1757 "dhcp6_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
@@ -4289,37 +4290,37 @@ YY_RULE_SETUP
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 1761 "dhcp6_lexer.ll"
+#line 1762 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_LSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 1762 "dhcp6_lexer.ll"
+#line 1763 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_RSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 1763 "dhcp6_lexer.ll"
+#line 1764 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_LCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 1764 "dhcp6_lexer.ll"
+#line 1765 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_RCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 1765 "dhcp6_lexer.ll"
+#line 1766 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_COMMA(driver.loc_); }
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 1766 "dhcp6_lexer.ll"
+#line 1767 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_COLON(driver.loc_); }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 1768 "dhcp6_lexer.ll"
+#line 1769 "dhcp6_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -4340,7 +4341,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 1786 "dhcp6_lexer.ll"
+#line 1787 "dhcp6_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -4356,7 +4357,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 1799 "dhcp6_lexer.ll"
+#line 1800 "dhcp6_lexer.ll"
 {
     string tmp(yytext);
     return isc::dhcp::Dhcp6Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -4364,33 +4365,33 @@ YY_RULE_SETUP
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 1804 "dhcp6_lexer.ll"
+#line 1805 "dhcp6_lexer.ll"
 {
    return isc::dhcp::Dhcp6Parser::make_NULL_TYPE(driver.loc_);
 }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 1808 "dhcp6_lexer.ll"
+#line 1809 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 1810 "dhcp6_lexer.ll"
+#line 1811 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 1812 "dhcp6_lexer.ll"
+#line 1813 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 1814 "dhcp6_lexer.ll"
+#line 1815 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1816 "dhcp6_lexer.ll"
+#line 1817 "dhcp6_lexer.ll"
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp6Parser::make_END(driver.loc_);
@@ -4416,10 +4417,10 @@ case YY_STATE_EOF(INITIAL):
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
-#line 1839 "dhcp6_lexer.ll"
+#line 1840 "dhcp6_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 4422 "dhcp6_lexer.cc"
+#line 4423 "dhcp6_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5524,7 +5525,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 1839 "dhcp6_lexer.ll"
+#line 1840 "dhcp6_lexer.ll"
 
 
 using namespace isc::dhcp;
diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc
index 0512817df8..a3cab1fd01 100644
--- a/src/bin/dhcp6/dhcp6_parser.cc
+++ b/src/bin/dhcp6/dhcp6_parser.cc
@@ -1054,8 +1054,8 @@ namespace isc { namespace dhcp {
 #line 1055 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 107:
-#line 471 "dhcp6_parser.yy" // lalr1.cc:907
+  case 108:
+#line 472 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("preferred-lifetime", prf);
@@ -1063,8 +1063,8 @@ namespace isc { namespace dhcp {
 #line 1064 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 108:
-#line 476 "dhcp6_parser.yy" // lalr1.cc:907
+  case 109:
+#line 477 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("valid-lifetime", prf);
@@ -1072,8 +1072,8 @@ namespace isc { namespace dhcp {
 #line 1073 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 109:
-#line 481 "dhcp6_parser.yy" // lalr1.cc:907
+  case 110:
+#line 482 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("renew-timer", prf);
@@ -1081,8 +1081,8 @@ namespace isc { namespace dhcp {
 #line 1082 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 110:
-#line 486 "dhcp6_parser.yy" // lalr1.cc:907
+  case 111:
+#line 487 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rebind-timer", prf);
@@ -1090,8 +1090,8 @@ namespace isc { namespace dhcp {
 #line 1091 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 111:
-#line 491 "dhcp6_parser.yy" // lalr1.cc:907
+  case 112:
+#line 492 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("decline-probation-period", dpp);
@@ -1099,16 +1099,16 @@ namespace isc { namespace dhcp {
 #line 1100 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 112:
-#line 496 "dhcp6_parser.yy" // lalr1.cc:907
+  case 113:
+#line 497 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1108 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 113:
-#line 498 "dhcp6_parser.yy" // lalr1.cc:907
+  case 114:
+#line 499 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr stag(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-tag", stag);
@@ -1117,8 +1117,8 @@ namespace isc { namespace dhcp {
 #line 1118 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 114:
-#line 504 "dhcp6_parser.yy" // lalr1.cc:907
+  case 115:
+#line 505 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces-config", i);
@@ -1128,8 +1128,8 @@ namespace isc { namespace dhcp {
 #line 1129 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 115:
-#line 509 "dhcp6_parser.yy" // lalr1.cc:907
+  case 116:
+#line 510 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // No interfaces config param is required
     ctx.stack_.pop_back();
@@ -1138,8 +1138,8 @@ namespace isc { namespace dhcp {
 #line 1139 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 116:
-#line 515 "dhcp6_parser.yy" // lalr1.cc:907
+  case 117:
+#line 516 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the interfaces-config map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1148,8 +1148,8 @@ namespace isc { namespace dhcp {
 #line 1149 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 117:
-#line 519 "dhcp6_parser.yy" // lalr1.cc:907
+  case 118:
+#line 520 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // No interfaces config param is required
     // parsing completed
@@ -1157,8 +1157,8 @@ namespace isc { namespace dhcp {
 #line 1158 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 125:
-#line 535 "dhcp6_parser.yy" // lalr1.cc:907
+  case 126:
+#line 536 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces", l);
@@ -1168,8 +1168,8 @@ namespace isc { namespace dhcp {
 #line 1169 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 126:
-#line 540 "dhcp6_parser.yy" // lalr1.cc:907
+  case 127:
+#line 541 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1177,8 +1177,8 @@ namespace isc { namespace dhcp {
 #line 1178 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 127:
-#line 545 "dhcp6_parser.yy" // lalr1.cc:907
+  case 128:
+#line 546 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("re-detect", b);
@@ -1186,8 +1186,8 @@ namespace isc { namespace dhcp {
 #line 1187 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 128:
-#line 551 "dhcp6_parser.yy" // lalr1.cc:907
+  case 129:
+#line 552 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lease-database", i);
@@ -1197,8 +1197,8 @@ namespace isc { namespace dhcp {
 #line 1198 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 129:
-#line 556 "dhcp6_parser.yy" // lalr1.cc:907
+  case 130:
+#line 557 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1208,8 +1208,8 @@ namespace isc { namespace dhcp {
 #line 1209 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 130:
-#line 563 "dhcp6_parser.yy" // lalr1.cc:907
+  case 131:
+#line 564 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-database", i);
@@ -1219,8 +1219,8 @@ namespace isc { namespace dhcp {
 #line 1220 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 131:
-#line 568 "dhcp6_parser.yy" // lalr1.cc:907
+  case 132:
+#line 569 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1230,8 +1230,8 @@ namespace isc { namespace dhcp {
 #line 1231 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 132:
-#line 575 "dhcp6_parser.yy" // lalr1.cc:907
+  case 133:
+#line 576 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-databases", l);
@@ -1241,8 +1241,8 @@ namespace isc { namespace dhcp {
 #line 1242 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 133:
-#line 580 "dhcp6_parser.yy" // lalr1.cc:907
+  case 134:
+#line 581 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1250,8 +1250,8 @@ namespace isc { namespace dhcp {
 #line 1251 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 138:
-#line 593 "dhcp6_parser.yy" // lalr1.cc:907
+  case 139:
+#line 594 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1260,8 +1260,8 @@ namespace isc { namespace dhcp {
 #line 1261 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 139:
-#line 597 "dhcp6_parser.yy" // lalr1.cc:907
+  case 140:
+#line 598 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1270,16 +1270,16 @@ namespace isc { namespace dhcp {
 #line 1271 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 160:
-#line 627 "dhcp6_parser.yy" // lalr1.cc:907
+  case 161:
+#line 628 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.DATABASE_TYPE);
 }
 #line 1279 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 161:
-#line 629 "dhcp6_parser.yy" // lalr1.cc:907
+  case 162:
+#line 630 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1287,40 +1287,40 @@ namespace isc { namespace dhcp {
 #line 1288 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 162:
-#line 634 "dhcp6_parser.yy" // lalr1.cc:907
+  case 163:
+#line 635 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); }
 #line 1294 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 163:
-#line 635 "dhcp6_parser.yy" // lalr1.cc:907
+  case 164:
+#line 636 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); }
 #line 1300 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 164:
-#line 636 "dhcp6_parser.yy" // lalr1.cc:907
+  case 165:
+#line 637 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); }
 #line 1306 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 165:
-#line 637 "dhcp6_parser.yy" // lalr1.cc:907
+  case 166:
+#line 638 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); }
 #line 1312 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 166:
-#line 640 "dhcp6_parser.yy" // lalr1.cc:907
+  case 167:
+#line 641 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1320 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 167:
-#line 642 "dhcp6_parser.yy" // lalr1.cc:907
+  case 168:
+#line 643 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user", user);
@@ -1329,16 +1329,16 @@ namespace isc { namespace dhcp {
 #line 1330 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 168:
-#line 648 "dhcp6_parser.yy" // lalr1.cc:907
+  case 169:
+#line 649 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1338 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 169:
-#line 650 "dhcp6_parser.yy" // lalr1.cc:907
+  case 170:
+#line 651 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password", pwd);
@@ -1347,16 +1347,16 @@ namespace isc { namespace dhcp {
 #line 1348 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 170:
-#line 656 "dhcp6_parser.yy" // lalr1.cc:907
+  case 171:
+#line 657 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1356 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 171:
-#line 658 "dhcp6_parser.yy" // lalr1.cc:907
+  case 172:
+#line 659 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host", h);
@@ -1365,8 +1365,8 @@ namespace isc { namespace dhcp {
 #line 1366 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 172:
-#line 664 "dhcp6_parser.yy" // lalr1.cc:907
+  case 173:
+#line 665 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr p(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", p);
@@ -1374,16 +1374,16 @@ namespace isc { namespace dhcp {
 #line 1375 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 173:
-#line 669 "dhcp6_parser.yy" // lalr1.cc:907
+  case 174:
+#line 670 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1383 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 174:
-#line 671 "dhcp6_parser.yy" // lalr1.cc:907
+  case 175:
+#line 672 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
@@ -1392,8 +1392,8 @@ namespace isc { namespace dhcp {
 #line 1393 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 175:
-#line 677 "dhcp6_parser.yy" // lalr1.cc:907
+  case 176:
+#line 678 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("persist", n);
@@ -1401,8 +1401,8 @@ namespace isc { namespace dhcp {
 #line 1402 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 176:
-#line 682 "dhcp6_parser.yy" // lalr1.cc:907
+  case 177:
+#line 683 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lfc-interval", n);
@@ -1410,8 +1410,8 @@ namespace isc { namespace dhcp {
 #line 1411 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 177:
-#line 687 "dhcp6_parser.yy" // lalr1.cc:907
+  case 178:
+#line 688 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("readonly", n);
@@ -1419,8 +1419,8 @@ namespace isc { namespace dhcp {
 #line 1420 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 178:
-#line 692 "dhcp6_parser.yy" // lalr1.cc:907
+  case 179:
+#line 693 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("connect-timeout", n);
@@ -1428,8 +1428,8 @@ namespace isc { namespace dhcp {
 #line 1429 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 179:
-#line 697 "dhcp6_parser.yy" // lalr1.cc:907
+  case 180:
+#line 698 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reconnect-wait-time", n);
@@ -1437,8 +1437,8 @@ namespace isc { namespace dhcp {
 #line 1438 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 180:
-#line 702 "dhcp6_parser.yy" // lalr1.cc:907
+  case 181:
+#line 703 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("request-timeout", n);
@@ -1446,8 +1446,8 @@ namespace isc { namespace dhcp {
 #line 1447 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 181:
-#line 707 "dhcp6_parser.yy" // lalr1.cc:907
+  case 182:
+#line 708 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-keepalive", n);
@@ -1455,8 +1455,8 @@ namespace isc { namespace dhcp {
 #line 1456 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 182:
-#line 712 "dhcp6_parser.yy" // lalr1.cc:907
+  case 183:
+#line 713 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-nodelay", n);
@@ -1464,16 +1464,16 @@ namespace isc { namespace dhcp {
 #line 1465 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 183:
-#line 717 "dhcp6_parser.yy" // lalr1.cc:907
+  case 184:
+#line 718 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1473 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 184:
-#line 719 "dhcp6_parser.yy" // lalr1.cc:907
+  case 185:
+#line 720 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr cp(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("contact-points", cp);
@@ -1482,8 +1482,8 @@ namespace isc { namespace dhcp {
 #line 1483 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 185:
-#line 725 "dhcp6_parser.yy" // lalr1.cc:907
+  case 186:
+#line 726 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reconnect-tries", n);
@@ -1491,16 +1491,16 @@ namespace isc { namespace dhcp {
 #line 1492 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 186:
-#line 730 "dhcp6_parser.yy" // lalr1.cc:907
+  case 187:
+#line 731 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1500 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 187:
-#line 732 "dhcp6_parser.yy" // lalr1.cc:907
+  case 188:
+#line 733 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr ks(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("keyspace", ks);
@@ -1509,8 +1509,8 @@ namespace isc { namespace dhcp {
 #line 1510 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 188:
-#line 738 "dhcp6_parser.yy" // lalr1.cc:907
+  case 189:
+#line 739 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sanity-checks", m);
@@ -1520,8 +1520,8 @@ namespace isc { namespace dhcp {
 #line 1521 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 189:
-#line 743 "dhcp6_parser.yy" // lalr1.cc:907
+  case 190:
+#line 744 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1529,16 +1529,16 @@ namespace isc { namespace dhcp {
 #line 1530 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 193:
-#line 753 "dhcp6_parser.yy" // lalr1.cc:907
+  case 194:
+#line 754 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1538 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 194:
-#line 755 "dhcp6_parser.yy" // lalr1.cc:907
+  case 195:
+#line 756 "dhcp6_parser.yy" // lalr1.cc:907
     {
 
     if ( (string(yystack_[0].value.as< std::string > ()) == "none") ||
@@ -1557,8 +1557,8 @@ namespace isc { namespace dhcp {
 #line 1558 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 195:
-#line 771 "dhcp6_parser.yy" // lalr1.cc:907
+  case 196:
+#line 772 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("mac-sources", l);
@@ -1568,8 +1568,8 @@ namespace isc { namespace dhcp {
 #line 1569 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 196:
-#line 776 "dhcp6_parser.yy" // lalr1.cc:907
+  case 197:
+#line 777 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1577,8 +1577,8 @@ namespace isc { namespace dhcp {
 #line 1578 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 201:
-#line 789 "dhcp6_parser.yy" // lalr1.cc:907
+  case 202:
+#line 790 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
@@ -1586,8 +1586,8 @@ namespace isc { namespace dhcp {
 #line 1587 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 202:
-#line 794 "dhcp6_parser.yy" // lalr1.cc:907
+  case 203:
+#line 795 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr duid(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
@@ -1595,8 +1595,8 @@ namespace isc { namespace dhcp {
 #line 1596 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 203:
-#line 799 "dhcp6_parser.yy" // lalr1.cc:907
+  case 204:
+#line 800 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host-reservation-identifiers", l);
@@ -1606,8 +1606,8 @@ namespace isc { namespace dhcp {
 #line 1607 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 204:
-#line 804 "dhcp6_parser.yy" // lalr1.cc:907
+  case 205:
+#line 805 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1615,8 +1615,8 @@ namespace isc { namespace dhcp {
 #line 1616 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 210:
-#line 818 "dhcp6_parser.yy" // lalr1.cc:907
+  case 211:
+#line 819 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(hwaddr);
@@ -1624,8 +1624,8 @@ namespace isc { namespace dhcp {
 #line 1625 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 211:
-#line 823 "dhcp6_parser.yy" // lalr1.cc:907
+  case 212:
+#line 824 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr flex_id(new StringElement("flex-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(flex_id);
@@ -1633,8 +1633,8 @@ namespace isc { namespace dhcp {
 #line 1634 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 212:
-#line 830 "dhcp6_parser.yy" // lalr1.cc:907
+  case 213:
+#line 831 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay-supplied-options", l);
@@ -1644,8 +1644,8 @@ namespace isc { namespace dhcp {
 #line 1645 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 213:
-#line 835 "dhcp6_parser.yy" // lalr1.cc:907
+  case 214:
+#line 836 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1653,8 +1653,8 @@ namespace isc { namespace dhcp {
 #line 1654 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 214:
-#line 840 "dhcp6_parser.yy" // lalr1.cc:907
+  case 215:
+#line 841 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hooks-libraries", l);
@@ -1664,8 +1664,8 @@ namespace isc { namespace dhcp {
 #line 1665 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 215:
-#line 845 "dhcp6_parser.yy" // lalr1.cc:907
+  case 216:
+#line 846 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1673,8 +1673,8 @@ namespace isc { namespace dhcp {
 #line 1674 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 220:
-#line 858 "dhcp6_parser.yy" // lalr1.cc:907
+  case 221:
+#line 859 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1683,8 +1683,8 @@ namespace isc { namespace dhcp {
 #line 1684 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 221:
-#line 862 "dhcp6_parser.yy" // lalr1.cc:907
+  case 222:
+#line 863 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1693,8 +1693,8 @@ namespace isc { namespace dhcp {
 #line 1694 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 222:
-#line 868 "dhcp6_parser.yy" // lalr1.cc:907
+  case 223:
+#line 869 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the hooks-libraries list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1703,8 +1703,8 @@ namespace isc { namespace dhcp {
 #line 1704 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 223:
-#line 872 "dhcp6_parser.yy" // lalr1.cc:907
+  case 224:
+#line 873 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1713,16 +1713,16 @@ namespace isc { namespace dhcp {
 #line 1714 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 229:
-#line 887 "dhcp6_parser.yy" // lalr1.cc:907
+  case 230:
+#line 888 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1722 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 230:
-#line 889 "dhcp6_parser.yy" // lalr1.cc:907
+  case 231:
+#line 890 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("library", lib);
@@ -1731,16 +1731,16 @@ namespace isc { namespace dhcp {
 #line 1732 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 231:
-#line 895 "dhcp6_parser.yy" // lalr1.cc:907
+  case 232:
+#line 896 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1740 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 232:
-#line 897 "dhcp6_parser.yy" // lalr1.cc:907
+  case 233:
+#line 898 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -1748,8 +1748,8 @@ namespace isc { namespace dhcp {
 #line 1749 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 233:
-#line 903 "dhcp6_parser.yy" // lalr1.cc:907
+  case 234:
+#line 904 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("expired-leases-processing", m);
@@ -1759,8 +1759,8 @@ namespace isc { namespace dhcp {
 #line 1760 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 234:
-#line 908 "dhcp6_parser.yy" // lalr1.cc:907
+  case 235:
+#line 909 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // No expired lease parameter is required
     ctx.stack_.pop_back();
@@ -1769,8 +1769,8 @@ namespace isc { namespace dhcp {
 #line 1770 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 243:
-#line 926 "dhcp6_parser.yy" // lalr1.cc:907
+  case 244:
+#line 927 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reclaim-timer-wait-time", value);
@@ -1778,8 +1778,8 @@ namespace isc { namespace dhcp {
 #line 1779 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 244:
-#line 931 "dhcp6_parser.yy" // lalr1.cc:907
+  case 245:
+#line 932 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush-reclaimed-timer-wait-time", value);
@@ -1787,8 +1787,8 @@ namespace isc { namespace dhcp {
 #line 1788 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 245:
-#line 936 "dhcp6_parser.yy" // lalr1.cc:907
+  case 246:
+#line 937 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hold-reclaimed-time", value);
@@ -1796,8 +1796,8 @@ namespace isc { namespace dhcp {
 #line 1797 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 246:
-#line 941 "dhcp6_parser.yy" // lalr1.cc:907
+  case 247:
+#line 942 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-leases", value);
@@ -1805,8 +1805,8 @@ namespace isc { namespace dhcp {
 #line 1806 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 247:
-#line 946 "dhcp6_parser.yy" // lalr1.cc:907
+  case 248:
+#line 947 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-time", value);
@@ -1814,8 +1814,8 @@ namespace isc { namespace dhcp {
 #line 1815 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 248:
-#line 951 "dhcp6_parser.yy" // lalr1.cc:907
+  case 249:
+#line 952 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("unwarned-reclaim-cycles", value);
@@ -1823,8 +1823,8 @@ namespace isc { namespace dhcp {
 #line 1824 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 249:
-#line 959 "dhcp6_parser.yy" // lalr1.cc:907
+  case 250:
+#line 960 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet6", l);
@@ -1834,8 +1834,8 @@ namespace isc { namespace dhcp {
 #line 1835 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 250:
-#line 964 "dhcp6_parser.yy" // lalr1.cc:907
+  case 251:
+#line 965 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1843,8 +1843,8 @@ namespace isc { namespace dhcp {
 #line 1844 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 255:
-#line 984 "dhcp6_parser.yy" // lalr1.cc:907
+  case 256:
+#line 985 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1853,8 +1853,8 @@ namespace isc { namespace dhcp {
 #line 1854 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 256:
-#line 988 "dhcp6_parser.yy" // lalr1.cc:907
+  case 257:
+#line 989 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Once we reached this place, the subnet parsing is now complete.
     // If we want to, we can implement default values here.
@@ -1879,8 +1879,8 @@ namespace isc { namespace dhcp {
 #line 1880 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 257:
-#line 1010 "dhcp6_parser.yy" // lalr1.cc:907
+  case 258:
+#line 1011 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the subnet6 list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1889,8 +1889,8 @@ namespace isc { namespace dhcp {
 #line 1890 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 258:
-#line 1014 "dhcp6_parser.yy" // lalr1.cc:907
+  case 259:
+#line 1015 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The subnet subnet6 parameter is required
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1899,16 +1899,16 @@ namespace isc { namespace dhcp {
 #line 1900 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 281:
-#line 1048 "dhcp6_parser.yy" // lalr1.cc:907
+  case 282:
+#line 1049 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1908 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 282:
-#line 1050 "dhcp6_parser.yy" // lalr1.cc:907
+  case 283:
+#line 1051 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet", subnet);
@@ -1917,16 +1917,16 @@ namespace isc { namespace dhcp {
 #line 1918 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 283:
-#line 1056 "dhcp6_parser.yy" // lalr1.cc:907
+  case 284:
+#line 1057 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1926 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 284:
-#line 1058 "dhcp6_parser.yy" // lalr1.cc:907
+  case 285:
+#line 1059 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface", iface);
@@ -1935,16 +1935,16 @@ namespace isc { namespace dhcp {
 #line 1936 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 285:
-#line 1064 "dhcp6_parser.yy" // lalr1.cc:907
+  case 286:
+#line 1065 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1944 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 286:
-#line 1066 "dhcp6_parser.yy" // lalr1.cc:907
+  case 287:
+#line 1067 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface-id", iface);
@@ -1953,16 +1953,16 @@ namespace isc { namespace dhcp {
 #line 1954 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 287:
-#line 1072 "dhcp6_parser.yy" // lalr1.cc:907
+  case 288:
+#line 1073 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1962 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 288:
-#line 1074 "dhcp6_parser.yy" // lalr1.cc:907
+  case 289:
+#line 1075 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr cls(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-class", cls);
@@ -1971,8 +1971,8 @@ namespace isc { namespace dhcp {
 #line 1972 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 289:
-#line 1080 "dhcp6_parser.yy" // lalr1.cc:907
+  case 290:
+#line 1081 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("require-client-classes", c);
@@ -1982,8 +1982,8 @@ namespace isc { namespace dhcp {
 #line 1983 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 290:
-#line 1085 "dhcp6_parser.yy" // lalr1.cc:907
+  case 291:
+#line 1086 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1991,16 +1991,16 @@ namespace isc { namespace dhcp {
 #line 1992 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 291:
-#line 1090 "dhcp6_parser.yy" // lalr1.cc:907
+  case 292:
+#line 1091 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.RESERVATION_MODE);
 }
 #line 2000 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 292:
-#line 1092 "dhcp6_parser.yy" // lalr1.cc:907
+  case 293:
+#line 1093 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2008,32 +2008,32 @@ namespace isc { namespace dhcp {
 #line 2009 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 293:
-#line 1097 "dhcp6_parser.yy" // lalr1.cc:907
+  case 294:
+#line 1098 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); }
 #line 2015 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 294:
-#line 1098 "dhcp6_parser.yy" // lalr1.cc:907
+  case 295:
+#line 1099 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); }
 #line 2021 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 295:
-#line 1099 "dhcp6_parser.yy" // lalr1.cc:907
+  case 296:
+#line 1100 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("global", ctx.loc2pos(yystack_[0].location))); }
 #line 2027 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 296:
-#line 1100 "dhcp6_parser.yy" // lalr1.cc:907
+  case 297:
+#line 1101 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); }
 #line 2033 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 297:
-#line 1103 "dhcp6_parser.yy" // lalr1.cc:907
+  case 298:
+#line 1104 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("id", id);
@@ -2041,8 +2041,8 @@ namespace isc { namespace dhcp {
 #line 2042 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 298:
-#line 1108 "dhcp6_parser.yy" // lalr1.cc:907
+  case 299:
+#line 1109 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr rc(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rapid-commit", rc);
@@ -2050,8 +2050,8 @@ namespace isc { namespace dhcp {
 #line 2051 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 299:
-#line 1116 "dhcp6_parser.yy" // lalr1.cc:907
+  case 300:
+#line 1117 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("shared-networks", l);
@@ -2061,8 +2061,8 @@ namespace isc { namespace dhcp {
 #line 2062 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 300:
-#line 1121 "dhcp6_parser.yy" // lalr1.cc:907
+  case 301:
+#line 1122 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2070,8 +2070,8 @@ namespace isc { namespace dhcp {
 #line 2071 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 305:
-#line 1136 "dhcp6_parser.yy" // lalr1.cc:907
+  case 306:
+#line 1137 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2080,16 +2080,16 @@ namespace isc { namespace dhcp {
 #line 2081 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 306:
-#line 1140 "dhcp6_parser.yy" // lalr1.cc:907
+  case 307:
+#line 1141 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
 }
 #line 2089 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 326:
-#line 1171 "dhcp6_parser.yy" // lalr1.cc:907
+  case 327:
+#line 1172 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-def", l);
@@ -2099,8 +2099,8 @@ namespace isc { namespace dhcp {
 #line 2100 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 327:
-#line 1176 "dhcp6_parser.yy" // lalr1.cc:907
+  case 328:
+#line 1177 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2108,8 +2108,8 @@ namespace isc { namespace dhcp {
 #line 2109 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 328:
-#line 1184 "dhcp6_parser.yy" // lalr1.cc:907
+  case 329:
+#line 1185 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
@@ -2117,16 +2117,16 @@ namespace isc { namespace dhcp {
 #line 2118 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 329:
-#line 1187 "dhcp6_parser.yy" // lalr1.cc:907
+  case 330:
+#line 1188 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // parsing completed
 }
 #line 2126 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 334:
-#line 1203 "dhcp6_parser.yy" // lalr1.cc:907
+  case 335:
+#line 1204 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2135,8 +2135,8 @@ namespace isc { namespace dhcp {
 #line 2136 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 335:
-#line 1207 "dhcp6_parser.yy" // lalr1.cc:907
+  case 336:
+#line 1208 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2147,8 +2147,8 @@ namespace isc { namespace dhcp {
 #line 2148 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 336:
-#line 1218 "dhcp6_parser.yy" // lalr1.cc:907
+  case 337:
+#line 1219 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the option-def list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2157,8 +2157,8 @@ namespace isc { namespace dhcp {
 #line 2158 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 337:
-#line 1222 "dhcp6_parser.yy" // lalr1.cc:907
+  case 338:
+#line 1223 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2169,8 +2169,8 @@ namespace isc { namespace dhcp {
 #line 2170 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 353:
-#line 1254 "dhcp6_parser.yy" // lalr1.cc:907
+  case 354:
+#line 1255 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("code", code);
@@ -2178,16 +2178,16 @@ namespace isc { namespace dhcp {
 #line 2179 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 355:
-#line 1261 "dhcp6_parser.yy" // lalr1.cc:907
+  case 356:
+#line 1262 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2187 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 356:
-#line 1263 "dhcp6_parser.yy" // lalr1.cc:907
+  case 357:
+#line 1264 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("type", prf);
@@ -2196,16 +2196,16 @@ namespace isc { namespace dhcp {
 #line 2197 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 357:
-#line 1269 "dhcp6_parser.yy" // lalr1.cc:907
+  case 358:
+#line 1270 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2205 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 358:
-#line 1271 "dhcp6_parser.yy" // lalr1.cc:907
+  case 359:
+#line 1272 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr rtypes(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("record-types", rtypes);
@@ -2214,16 +2214,16 @@ namespace isc { namespace dhcp {
 #line 2215 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 359:
-#line 1277 "dhcp6_parser.yy" // lalr1.cc:907
+  case 360:
+#line 1278 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2223 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 360:
-#line 1279 "dhcp6_parser.yy" // lalr1.cc:907
+  case 361:
+#line 1280 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("space", space);
@@ -2232,16 +2232,16 @@ namespace isc { namespace dhcp {
 #line 2233 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 362:
-#line 1287 "dhcp6_parser.yy" // lalr1.cc:907
+  case 363:
+#line 1288 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2241 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 363:
-#line 1289 "dhcp6_parser.yy" // lalr1.cc:907
+  case 364:
+#line 1290 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("encapsulate", encap);
@@ -2250,8 +2250,8 @@ namespace isc { namespace dhcp {
 #line 2251 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 364:
-#line 1295 "dhcp6_parser.yy" // lalr1.cc:907
+  case 365:
+#line 1296 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("array", array);
@@ -2259,8 +2259,8 @@ namespace isc { namespace dhcp {
 #line 2260 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 365:
-#line 1304 "dhcp6_parser.yy" // lalr1.cc:907
+  case 366:
+#line 1305 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-data", l);
@@ -2270,8 +2270,8 @@ namespace isc { namespace dhcp {
 #line 2271 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 366:
-#line 1309 "dhcp6_parser.yy" // lalr1.cc:907
+  case 367:
+#line 1310 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2279,8 +2279,8 @@ namespace isc { namespace dhcp {
 #line 2280 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 371:
-#line 1328 "dhcp6_parser.yy" // lalr1.cc:907
+  case 372:
+#line 1329 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2289,8 +2289,8 @@ namespace isc { namespace dhcp {
 #line 2290 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 372:
-#line 1332 "dhcp6_parser.yy" // lalr1.cc:907
+  case 373:
+#line 1333 "dhcp6_parser.yy" // lalr1.cc:907
     {
     /// @todo: the code or name parameters are required.
     ctx.stack_.pop_back();
@@ -2298,8 +2298,8 @@ namespace isc { namespace dhcp {
 #line 2299 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 373:
-#line 1340 "dhcp6_parser.yy" // lalr1.cc:907
+  case 374:
+#line 1341 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the option-data list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2308,8 +2308,8 @@ namespace isc { namespace dhcp {
 #line 2309 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 374:
-#line 1344 "dhcp6_parser.yy" // lalr1.cc:907
+  case 375:
+#line 1345 "dhcp6_parser.yy" // lalr1.cc:907
     {
     /// @todo: the code or name parameters are required.
     // parsing completed
@@ -2317,16 +2317,16 @@ namespace isc { namespace dhcp {
 #line 2318 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 389:
-#line 1377 "dhcp6_parser.yy" // lalr1.cc:907
+  case 390:
+#line 1378 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2326 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 390:
-#line 1379 "dhcp6_parser.yy" // lalr1.cc:907
+  case 391:
+#line 1380 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
@@ -2335,8 +2335,8 @@ namespace isc { namespace dhcp {
 #line 2336 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 393:
-#line 1389 "dhcp6_parser.yy" // lalr1.cc:907
+  case 394:
+#line 1390 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", space);
@@ -2344,8 +2344,8 @@ namespace isc { namespace dhcp {
 #line 2345 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 394:
-#line 1394 "dhcp6_parser.yy" // lalr1.cc:907
+  case 395:
+#line 1395 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
@@ -2353,8 +2353,8 @@ namespace isc { namespace dhcp {
 #line 2354 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 395:
-#line 1402 "dhcp6_parser.yy" // lalr1.cc:907
+  case 396:
+#line 1403 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pools", l);
@@ -2364,8 +2364,8 @@ namespace isc { namespace dhcp {
 #line 2365 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 396:
-#line 1407 "dhcp6_parser.yy" // lalr1.cc:907
+  case 397:
+#line 1408 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2373,8 +2373,8 @@ namespace isc { namespace dhcp {
 #line 2374 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 401:
-#line 1422 "dhcp6_parser.yy" // lalr1.cc:907
+  case 402:
+#line 1423 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2383,8 +2383,8 @@ namespace isc { namespace dhcp {
 #line 2384 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 402:
-#line 1426 "dhcp6_parser.yy" // lalr1.cc:907
+  case 403:
+#line 1427 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2393,8 +2393,8 @@ namespace isc { namespace dhcp {
 #line 2394 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 403:
-#line 1432 "dhcp6_parser.yy" // lalr1.cc:907
+  case 404:
+#line 1433 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2403,8 +2403,8 @@ namespace isc { namespace dhcp {
 #line 2404 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 404:
-#line 1436 "dhcp6_parser.yy" // lalr1.cc:907
+  case 405:
+#line 1437 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2412,16 +2412,16 @@ namespace isc { namespace dhcp {
 #line 2413 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 414:
-#line 1454 "dhcp6_parser.yy" // lalr1.cc:907
+  case 415:
+#line 1455 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2421 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 415:
-#line 1456 "dhcp6_parser.yy" // lalr1.cc:907
+  case 416:
+#line 1457 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
@@ -2430,16 +2430,16 @@ namespace isc { namespace dhcp {
 #line 2431 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 416:
-#line 1462 "dhcp6_parser.yy" // lalr1.cc:907
+  case 417:
+#line 1463 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2439 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 417:
-#line 1464 "dhcp6_parser.yy" // lalr1.cc:907
+  case 418:
+#line 1465 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context = yystack_[0].value.as< ElementPtr > ();
@@ -2465,16 +2465,16 @@ namespace isc { namespace dhcp {
 #line 2466 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 418:
-#line 1487 "dhcp6_parser.yy" // lalr1.cc:907
+  case 419:
+#line 1488 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2474 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 419:
-#line 1489 "dhcp6_parser.yy" // lalr1.cc:907
+  case 420:
+#line 1490 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location)));
@@ -2502,8 +2502,8 @@ namespace isc { namespace dhcp {
 #line 2503 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 420:
-#line 1517 "dhcp6_parser.yy" // lalr1.cc:907
+  case 421:
+#line 1518 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pd-pools", l);
@@ -2513,8 +2513,8 @@ namespace isc { namespace dhcp {
 #line 2514 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 421:
-#line 1522 "dhcp6_parser.yy" // lalr1.cc:907
+  case 422:
+#line 1523 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2522,8 +2522,8 @@ namespace isc { namespace dhcp {
 #line 2523 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 426:
-#line 1537 "dhcp6_parser.yy" // lalr1.cc:907
+  case 427:
+#line 1538 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2532,8 +2532,8 @@ namespace isc { namespace dhcp {
 #line 2533 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 427:
-#line 1541 "dhcp6_parser.yy" // lalr1.cc:907
+  case 428:
+#line 1542 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The prefix, prefix len and delegated len parameters are required.
     ctx.require("prefix", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2544,8 +2544,8 @@ namespace isc { namespace dhcp {
 #line 2545 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 428:
-#line 1549 "dhcp6_parser.yy" // lalr1.cc:907
+  case 429:
+#line 1550 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the pd-pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2554,8 +2554,8 @@ namespace isc { namespace dhcp {
 #line 2555 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 429:
-#line 1553 "dhcp6_parser.yy" // lalr1.cc:907
+  case 430:
+#line 1554 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The prefix, prefix len and delegated len parameters are required.
     ctx.require("prefix", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2566,16 +2566,16 @@ namespace isc { namespace dhcp {
 #line 2567 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 443:
-#line 1578 "dhcp6_parser.yy" // lalr1.cc:907
+  case 444:
+#line 1579 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2575 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 444:
-#line 1580 "dhcp6_parser.yy" // lalr1.cc:907
+  case 445:
+#line 1581 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefix", prf);
@@ -2584,8 +2584,8 @@ namespace isc { namespace dhcp {
 #line 2585 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 445:
-#line 1586 "dhcp6_parser.yy" // lalr1.cc:907
+  case 446:
+#line 1587 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefix-len", prf);
@@ -2593,16 +2593,16 @@ namespace isc { namespace dhcp {
 #line 2594 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 446:
-#line 1591 "dhcp6_parser.yy" // lalr1.cc:907
+  case 447:
+#line 1592 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2602 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 447:
-#line 1593 "dhcp6_parser.yy" // lalr1.cc:907
+  case 448:
+#line 1594 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("excluded-prefix", prf);
@@ -2611,8 +2611,8 @@ namespace isc { namespace dhcp {
 #line 2612 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 448:
-#line 1599 "dhcp6_parser.yy" // lalr1.cc:907
+  case 449:
+#line 1600 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("excluded-prefix-len", prf);
@@ -2620,8 +2620,8 @@ namespace isc { namespace dhcp {
 #line 2621 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 449:
-#line 1604 "dhcp6_parser.yy" // lalr1.cc:907
+  case 450:
+#line 1605 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr deleg(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("delegated-len", deleg);
@@ -2629,8 +2629,8 @@ namespace isc { namespace dhcp {
 #line 2630 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 450:
-#line 1612 "dhcp6_parser.yy" // lalr1.cc:907
+  case 451:
+#line 1613 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations", l);
@@ -2640,8 +2640,8 @@ namespace isc { namespace dhcp {
 #line 2641 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 451:
-#line 1617 "dhcp6_parser.yy" // lalr1.cc:907
+  case 452:
+#line 1618 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2649,8 +2649,8 @@ namespace isc { namespace dhcp {
 #line 2650 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 456:
-#line 1630 "dhcp6_parser.yy" // lalr1.cc:907
+  case 457:
+#line 1631 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2659,8 +2659,8 @@ namespace isc { namespace dhcp {
 #line 2660 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 457:
-#line 1634 "dhcp6_parser.yy" // lalr1.cc:907
+  case 458:
+#line 1635 "dhcp6_parser.yy" // lalr1.cc:907
     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
@@ -2668,8 +2668,8 @@ namespace isc { namespace dhcp {
 #line 2669 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 458:
-#line 1639 "dhcp6_parser.yy" // lalr1.cc:907
+  case 459:
+#line 1640 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2678,8 +2678,8 @@ namespace isc { namespace dhcp {
 #line 2679 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 459:
-#line 1643 "dhcp6_parser.yy" // lalr1.cc:907
+  case 460:
+#line 1644 "dhcp6_parser.yy" // lalr1.cc:907
     {
     /// @todo: an identifier parameter is required.
     // parsing completed
@@ -2687,8 +2687,8 @@ namespace isc { namespace dhcp {
 #line 2688 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 475:
-#line 1670 "dhcp6_parser.yy" // lalr1.cc:907
+  case 476:
+#line 1671 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-addresses", l);
@@ -2698,8 +2698,8 @@ namespace isc { namespace dhcp {
 #line 2699 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 476:
-#line 1675 "dhcp6_parser.yy" // lalr1.cc:907
+  case 477:
+#line 1676 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2707,8 +2707,8 @@ namespace isc { namespace dhcp {
 #line 2708 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 477:
-#line 1680 "dhcp6_parser.yy" // lalr1.cc:907
+  case 478:
+#line 1681 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefixes", l);
@@ -2718,8 +2718,8 @@ namespace isc { namespace dhcp {
 #line 2719 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 478:
-#line 1685 "dhcp6_parser.yy" // lalr1.cc:907
+  case 479:
+#line 1686 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2727,16 +2727,16 @@ namespace isc { namespace dhcp {
 #line 2728 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 479:
-#line 1690 "dhcp6_parser.yy" // lalr1.cc:907
+  case 480:
+#line 1691 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2736 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 480:
-#line 1692 "dhcp6_parser.yy" // lalr1.cc:907
+  case 481:
+#line 1693 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
@@ -2745,16 +2745,16 @@ namespace isc { namespace dhcp {
 #line 2746 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 481:
-#line 1698 "dhcp6_parser.yy" // lalr1.cc:907
+  case 482:
+#line 1699 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2754 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 482:
-#line 1700 "dhcp6_parser.yy" // lalr1.cc:907
+  case 483:
+#line 1701 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hw-address", hw);
@@ -2763,16 +2763,16 @@ namespace isc { namespace dhcp {
 #line 2764 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 483:
-#line 1706 "dhcp6_parser.yy" // lalr1.cc:907
+  case 484:
+#line 1707 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2772 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 484:
-#line 1708 "dhcp6_parser.yy" // lalr1.cc:907
+  case 485:
+#line 1709 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
@@ -2781,16 +2781,16 @@ namespace isc { namespace dhcp {
 #line 2782 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 485:
-#line 1714 "dhcp6_parser.yy" // lalr1.cc:907
+  case 486:
+#line 1715 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2790 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 486:
-#line 1716 "dhcp6_parser.yy" // lalr1.cc:907
+  case 487:
+#line 1717 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flex-id", hw);
@@ -2799,8 +2799,8 @@ namespace isc { namespace dhcp {
 #line 2800 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 487:
-#line 1722 "dhcp6_parser.yy" // lalr1.cc:907
+  case 488:
+#line 1723 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", c);
@@ -2810,8 +2810,8 @@ namespace isc { namespace dhcp {
 #line 2811 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 488:
-#line 1727 "dhcp6_parser.yy" // lalr1.cc:907
+  case 489:
+#line 1728 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2819,8 +2819,8 @@ namespace isc { namespace dhcp {
 #line 2820 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 489:
-#line 1735 "dhcp6_parser.yy" // lalr1.cc:907
+  case 490:
+#line 1736 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay", m);
@@ -2830,8 +2830,8 @@ namespace isc { namespace dhcp {
 #line 2831 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 490:
-#line 1740 "dhcp6_parser.yy" // lalr1.cc:907
+  case 491:
+#line 1741 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2839,16 +2839,16 @@ namespace isc { namespace dhcp {
 #line 2840 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 493:
-#line 1749 "dhcp6_parser.yy" // lalr1.cc:907
+  case 494:
+#line 1750 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2848 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 494:
-#line 1751 "dhcp6_parser.yy" // lalr1.cc:907
+  case 495:
+#line 1752 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr addr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", addr);
@@ -2857,8 +2857,8 @@ namespace isc { namespace dhcp {
 #line 2858 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 495:
-#line 1760 "dhcp6_parser.yy" // lalr1.cc:907
+  case 496:
+#line 1761 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", l);
@@ -2868,8 +2868,8 @@ namespace isc { namespace dhcp {
 #line 2869 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 496:
-#line 1765 "dhcp6_parser.yy" // lalr1.cc:907
+  case 497:
+#line 1766 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2877,8 +2877,8 @@ namespace isc { namespace dhcp {
 #line 2878 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 499:
-#line 1774 "dhcp6_parser.yy" // lalr1.cc:907
+  case 500:
+#line 1775 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2887,8 +2887,8 @@ namespace isc { namespace dhcp {
 #line 2888 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 500:
-#line 1778 "dhcp6_parser.yy" // lalr1.cc:907
+  case 501:
+#line 1779 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The name client class parameter is required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2897,16 +2897,16 @@ namespace isc { namespace dhcp {
 #line 2898 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 513:
-#line 1803 "dhcp6_parser.yy" // lalr1.cc:907
+  case 514:
+#line 1804 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2906 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 514:
-#line 1805 "dhcp6_parser.yy" // lalr1.cc:907
+  case 515:
+#line 1806 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
@@ -2915,8 +2915,8 @@ namespace isc { namespace dhcp {
 #line 2916 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 515:
-#line 1811 "dhcp6_parser.yy" // lalr1.cc:907
+  case 516:
+#line 1812 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("only-if-required", b);
@@ -2924,8 +2924,8 @@ namespace isc { namespace dhcp {
 #line 2925 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 516:
-#line 1819 "dhcp6_parser.yy" // lalr1.cc:907
+  case 517:
+#line 1820 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-id", m);
@@ -2935,8 +2935,8 @@ namespace isc { namespace dhcp {
 #line 2936 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 517:
-#line 1824 "dhcp6_parser.yy" // lalr1.cc:907
+  case 518:
+#line 1825 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The type parameter is required.
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -2946,16 +2946,16 @@ namespace isc { namespace dhcp {
 #line 2947 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 529:
-#line 1846 "dhcp6_parser.yy" // lalr1.cc:907
+  case 530:
+#line 1847 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.DUID_TYPE);
 }
 #line 2955 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 530:
-#line 1848 "dhcp6_parser.yy" // lalr1.cc:907
+  case 531:
+#line 1849 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2963,26 +2963,26 @@ namespace isc { namespace dhcp {
 #line 2964 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 531:
-#line 1853 "dhcp6_parser.yy" // lalr1.cc:907
+  case 532:
+#line 1854 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LLT", ctx.loc2pos(yystack_[0].location))); }
 #line 2970 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 532:
-#line 1854 "dhcp6_parser.yy" // lalr1.cc:907
+  case 533:
+#line 1855 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("EN", ctx.loc2pos(yystack_[0].location))); }
 #line 2976 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 533:
-#line 1855 "dhcp6_parser.yy" // lalr1.cc:907
+  case 534:
+#line 1856 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LL", ctx.loc2pos(yystack_[0].location))); }
 #line 2982 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 534:
-#line 1858 "dhcp6_parser.yy" // lalr1.cc:907
+  case 535:
+#line 1859 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr htype(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("htype", htype);
@@ -2990,16 +2990,16 @@ namespace isc { namespace dhcp {
 #line 2991 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 535:
-#line 1863 "dhcp6_parser.yy" // lalr1.cc:907
+  case 536:
+#line 1864 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2999 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 536:
-#line 1865 "dhcp6_parser.yy" // lalr1.cc:907
+  case 537:
+#line 1866 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr id(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("identifier", id);
@@ -3008,8 +3008,8 @@ namespace isc { namespace dhcp {
 #line 3009 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 537:
-#line 1871 "dhcp6_parser.yy" // lalr1.cc:907
+  case 538:
+#line 1872 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("time", time);
@@ -3017,8 +3017,8 @@ namespace isc { namespace dhcp {
 #line 3018 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 538:
-#line 1876 "dhcp6_parser.yy" // lalr1.cc:907
+  case 539:
+#line 1877 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enterprise-id", time);
@@ -3026,8 +3026,8 @@ namespace isc { namespace dhcp {
 #line 3027 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 539:
-#line 1883 "dhcp6_parser.yy" // lalr1.cc:907
+  case 540:
+#line 1884 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
@@ -3035,8 +3035,8 @@ namespace isc { namespace dhcp {
 #line 3036 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 540:
-#line 1890 "dhcp6_parser.yy" // lalr1.cc:907
+  case 541:
+#line 1891 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("control-socket", m);
@@ -3046,8 +3046,8 @@ namespace isc { namespace dhcp {
 #line 3047 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 541:
-#line 1895 "dhcp6_parser.yy" // lalr1.cc:907
+  case 542:
+#line 1896 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3055,16 +3055,16 @@ namespace isc { namespace dhcp {
 #line 3056 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 549:
-#line 1911 "dhcp6_parser.yy" // lalr1.cc:907
+  case 550:
+#line 1912 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3064 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 550:
-#line 1913 "dhcp6_parser.yy" // lalr1.cc:907
+  case 551:
+#line 1914 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-type", stype);
@@ -3073,16 +3073,16 @@ namespace isc { namespace dhcp {
 #line 3074 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 551:
-#line 1919 "dhcp6_parser.yy" // lalr1.cc:907
+  case 552:
+#line 1920 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3082 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 552:
-#line 1921 "dhcp6_parser.yy" // lalr1.cc:907
+  case 553:
+#line 1922 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-name", name);
@@ -3091,16 +3091,16 @@ namespace isc { namespace dhcp {
 #line 3092 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 553:
-#line 1929 "dhcp6_parser.yy" // lalr1.cc:907
+  case 554:
+#line 1930 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3100 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 554:
-#line 1931 "dhcp6_parser.yy" // lalr1.cc:907
+  case 555:
+#line 1932 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr qc = yystack_[0].value.as< ElementPtr > ();
     ctx.stack_.back()->set("dhcp-queue-control", qc);
@@ -3117,8 +3117,8 @@ namespace isc { namespace dhcp {
 #line 3118 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 555:
-#line 1947 "dhcp6_parser.yy" // lalr1.cc:907
+  case 556:
+#line 1948 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp-ddns", m);
@@ -3128,8 +3128,8 @@ namespace isc { namespace dhcp {
 #line 3129 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 556:
-#line 1952 "dhcp6_parser.yy" // lalr1.cc:907
+  case 557:
+#line 1953 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -3139,8 +3139,8 @@ namespace isc { namespace dhcp {
 #line 3140 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 557:
-#line 1959 "dhcp6_parser.yy" // lalr1.cc:907
+  case 558:
+#line 1960 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3149,8 +3149,8 @@ namespace isc { namespace dhcp {
 #line 3150 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 558:
-#line 1963 "dhcp6_parser.yy" // lalr1.cc:907
+  case 559:
+#line 1964 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -3159,8 +3159,8 @@ namespace isc { namespace dhcp {
 #line 3160 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 579:
-#line 1993 "dhcp6_parser.yy" // lalr1.cc:907
+  case 580:
+#line 1994 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
@@ -3168,16 +3168,16 @@ namespace isc { namespace dhcp {
 #line 3169 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 580:
-#line 1998 "dhcp6_parser.yy" // lalr1.cc:907
+  case 581:
+#line 1999 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3177 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 581:
-#line 2000 "dhcp6_parser.yy" // lalr1.cc:907
+  case 582:
+#line 2001 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("qualifying-suffix", s);
@@ -3186,16 +3186,16 @@ namespace isc { namespace dhcp {
 #line 3187 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 582:
-#line 2006 "dhcp6_parser.yy" // lalr1.cc:907
+  case 583:
+#line 2007 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3195 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 583:
-#line 2008 "dhcp6_parser.yy" // lalr1.cc:907
+  case 584:
+#line 2009 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-ip", s);
@@ -3204,8 +3204,8 @@ namespace isc { namespace dhcp {
 #line 3205 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 584:
-#line 2014 "dhcp6_parser.yy" // lalr1.cc:907
+  case 585:
+#line 2015 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
@@ -3213,16 +3213,16 @@ namespace isc { namespace dhcp {
 #line 3214 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 585:
-#line 2019 "dhcp6_parser.yy" // lalr1.cc:907
+  case 586:
+#line 2020 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3222 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 586:
-#line 2021 "dhcp6_parser.yy" // lalr1.cc:907
+  case 587:
+#line 2022 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-ip", s);
@@ -3231,8 +3231,8 @@ namespace isc { namespace dhcp {
 #line 3232 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 587:
-#line 2027 "dhcp6_parser.yy" // lalr1.cc:907
+  case 588:
+#line 2028 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
@@ -3240,8 +3240,8 @@ namespace isc { namespace dhcp {
 #line 3241 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 588:
-#line 2032 "dhcp6_parser.yy" // lalr1.cc:907
+  case 589:
+#line 2033 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
@@ -3249,16 +3249,16 @@ namespace isc { namespace dhcp {
 #line 3250 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 589:
-#line 2037 "dhcp6_parser.yy" // lalr1.cc:907
+  case 590:
+#line 2038 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
 #line 3258 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 590:
-#line 2039 "dhcp6_parser.yy" // lalr1.cc:907
+  case 591:
+#line 2040 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3266,28 +3266,28 @@ namespace isc { namespace dhcp {
 #line 3267 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 591:
-#line 2045 "dhcp6_parser.yy" // lalr1.cc:907
+  case 592:
+#line 2046 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
 #line 3273 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 592:
-#line 2046 "dhcp6_parser.yy" // lalr1.cc:907
+  case 593:
+#line 2047 "dhcp6_parser.yy" // lalr1.cc:907
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
 #line 3279 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 593:
-#line 2049 "dhcp6_parser.yy" // lalr1.cc:907
+  case 594:
+#line 2050 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
 #line 3287 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 594:
-#line 2051 "dhcp6_parser.yy" // lalr1.cc:907
+  case 595:
+#line 2052 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
@@ -3296,8 +3296,8 @@ namespace isc { namespace dhcp {
 #line 3297 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 595:
-#line 2057 "dhcp6_parser.yy" // lalr1.cc:907
+  case 596:
+#line 2058 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-no-update", b);
@@ -3305,8 +3305,8 @@ namespace isc { namespace dhcp {
 #line 3306 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 596:
-#line 2062 "dhcp6_parser.yy" // lalr1.cc:907
+  case 597:
+#line 2063 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-client-update", b);
@@ -3314,16 +3314,16 @@ namespace isc { namespace dhcp {
 #line 3315 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 597:
-#line 2067 "dhcp6_parser.yy" // lalr1.cc:907
+  case 598:
+#line 2068 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
 #line 3323 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 598:
-#line 2069 "dhcp6_parser.yy" // lalr1.cc:907
+  case 599:
+#line 2070 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3331,40 +3331,40 @@ namespace isc { namespace dhcp {
 #line 3332 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 599:
-#line 2075 "dhcp6_parser.yy" // lalr1.cc:907
+  case 600:
+#line 2076 "dhcp6_parser.yy" // lalr1.cc:907
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3340 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 600:
-#line 2078 "dhcp6_parser.yy" // lalr1.cc:907
+  case 601:
+#line 2079 "dhcp6_parser.yy" // lalr1.cc:907
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3348 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 601:
-#line 2081 "dhcp6_parser.yy" // lalr1.cc:907
+  case 602:
+#line 2082 "dhcp6_parser.yy" // lalr1.cc:907
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3356 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 602:
-#line 2084 "dhcp6_parser.yy" // lalr1.cc:907
+  case 603:
+#line 2085 "dhcp6_parser.yy" // lalr1.cc:907
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3364 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 603:
-#line 2087 "dhcp6_parser.yy" // lalr1.cc:907
+  case 604:
+#line 2088 "dhcp6_parser.yy" // lalr1.cc:907
     {
       error(yystack_[0].location, "boolean values for the replace-client-name are "
                 "no longer supported");
@@ -3372,16 +3372,16 @@ namespace isc { namespace dhcp {
 #line 3373 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 604:
-#line 2093 "dhcp6_parser.yy" // lalr1.cc:907
+  case 605:
+#line 2094 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3381 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 605:
-#line 2095 "dhcp6_parser.yy" // lalr1.cc:907
+  case 606:
+#line 2096 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("generated-prefix", s);
@@ -3390,16 +3390,16 @@ namespace isc { namespace dhcp {
 #line 3391 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 606:
-#line 2101 "dhcp6_parser.yy" // lalr1.cc:907
+  case 607:
+#line 2102 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3399 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 607:
-#line 2103 "dhcp6_parser.yy" // lalr1.cc:907
+  case 608:
+#line 2104 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-set", s);
@@ -3408,16 +3408,16 @@ namespace isc { namespace dhcp {
 #line 3409 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 608:
-#line 2109 "dhcp6_parser.yy" // lalr1.cc:907
+  case 609:
+#line 2110 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3417 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 609:
-#line 2111 "dhcp6_parser.yy" // lalr1.cc:907
+  case 610:
+#line 2112 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-replacement", s);
@@ -3426,16 +3426,16 @@ namespace isc { namespace dhcp {
 #line 3427 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 610:
-#line 2119 "dhcp6_parser.yy" // lalr1.cc:907
+  case 611:
+#line 2120 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3435 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 611:
-#line 2121 "dhcp6_parser.yy" // lalr1.cc:907
+  case 612:
+#line 2122 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3443,16 +3443,16 @@ namespace isc { namespace dhcp {
 #line 3444 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 612:
-#line 2126 "dhcp6_parser.yy" // lalr1.cc:907
+  case 613:
+#line 2127 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3452 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 613:
-#line 2128 "dhcp6_parser.yy" // lalr1.cc:907
+  case 614:
+#line 2129 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3460,16 +3460,16 @@ namespace isc { namespace dhcp {
 #line 3461 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 614:
-#line 2133 "dhcp6_parser.yy" // lalr1.cc:907
+  case 615:
+#line 2134 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3469 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 615:
-#line 2135 "dhcp6_parser.yy" // lalr1.cc:907
+  case 616:
+#line 2136 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.back()->set("Control-agent", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3477,8 +3477,8 @@ namespace isc { namespace dhcp {
 #line 3478 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 616:
-#line 2142 "dhcp6_parser.yy" // lalr1.cc:907
+  case 617:
+#line 2143 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3487,16 +3487,16 @@ namespace isc { namespace dhcp {
 #line 3488 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 617:
-#line 2146 "dhcp6_parser.yy" // lalr1.cc:907
+  case 618:
+#line 2147 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
 }
 #line 3496 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 618:
-#line 2151 "dhcp6_parser.yy" // lalr1.cc:907
+  case 619:
+#line 2152 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-control", i);
@@ -3506,8 +3506,8 @@ namespace isc { namespace dhcp {
 #line 3507 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 619:
-#line 2156 "dhcp6_parser.yy" // lalr1.cc:907
+  case 620:
+#line 2157 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // No config control params are required
     ctx.stack_.pop_back();
@@ -3516,8 +3516,8 @@ namespace isc { namespace dhcp {
 #line 3517 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 620:
-#line 2162 "dhcp6_parser.yy" // lalr1.cc:907
+  case 621:
+#line 2163 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the config-control map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3526,8 +3526,8 @@ namespace isc { namespace dhcp {
 #line 3527 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 621:
-#line 2166 "dhcp6_parser.yy" // lalr1.cc:907
+  case 622:
+#line 2167 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // No config_control params are required
     // parsing completed
@@ -3535,8 +3535,8 @@ namespace isc { namespace dhcp {
 #line 3536 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 626:
-#line 2181 "dhcp6_parser.yy" // lalr1.cc:907
+  case 627:
+#line 2182 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-databases", l);
@@ -3546,8 +3546,8 @@ namespace isc { namespace dhcp {
 #line 3547 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 627:
-#line 2186 "dhcp6_parser.yy" // lalr1.cc:907
+  case 628:
+#line 2187 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3555,8 +3555,8 @@ namespace isc { namespace dhcp {
 #line 3556 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 628:
-#line 2196 "dhcp6_parser.yy" // lalr1.cc:907
+  case 629:
+#line 2197 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("Logging", m);
@@ -3566,8 +3566,8 @@ namespace isc { namespace dhcp {
 #line 3567 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 629:
-#line 2201 "dhcp6_parser.yy" // lalr1.cc:907
+  case 630:
+#line 2202 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3575,8 +3575,8 @@ namespace isc { namespace dhcp {
 #line 3576 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 630:
-#line 2206 "dhcp6_parser.yy" // lalr1.cc:907
+  case 631:
+#line 2207 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // Parse the Logging map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3585,16 +3585,16 @@ namespace isc { namespace dhcp {
 #line 3586 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 631:
-#line 2210 "dhcp6_parser.yy" // lalr1.cc:907
+  case 632:
+#line 2211 "dhcp6_parser.yy" // lalr1.cc:907
     {
     // parsing completed
 }
 #line 3594 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 635:
-#line 2226 "dhcp6_parser.yy" // lalr1.cc:907
+  case 636:
+#line 2227 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("loggers", l);
@@ -3604,8 +3604,8 @@ namespace isc { namespace dhcp {
 #line 3605 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 636:
-#line 2231 "dhcp6_parser.yy" // lalr1.cc:907
+  case 637:
+#line 2232 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3613,8 +3613,8 @@ namespace isc { namespace dhcp {
 #line 3614 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 639:
-#line 2243 "dhcp6_parser.yy" // lalr1.cc:907
+  case 640:
+#line 2244 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
@@ -3623,16 +3623,16 @@ namespace isc { namespace dhcp {
 #line 3624 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 640:
-#line 2247 "dhcp6_parser.yy" // lalr1.cc:907
+  case 641:
+#line 2248 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
 }
 #line 3632 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 650:
-#line 2264 "dhcp6_parser.yy" // lalr1.cc:907
+  case 651:
+#line 2265 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
@@ -3640,16 +3640,16 @@ namespace isc { namespace dhcp {
 #line 3641 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 651:
-#line 2269 "dhcp6_parser.yy" // lalr1.cc:907
+  case 652:
+#line 2270 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3649 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 652:
-#line 2271 "dhcp6_parser.yy" // lalr1.cc:907
+  case 653:
+#line 2272 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
@@ -3658,8 +3658,8 @@ namespace isc { namespace dhcp {
 #line 3659 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 653:
-#line 2277 "dhcp6_parser.yy" // lalr1.cc:907
+  case 654:
+#line 2278 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
@@ -3669,8 +3669,8 @@ namespace isc { namespace dhcp {
 #line 3670 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 654:
-#line 2282 "dhcp6_parser.yy" // lalr1.cc:907
+  case 655:
+#line 2283 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3678,8 +3678,8 @@ namespace isc { namespace dhcp {
 #line 3679 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 657:
-#line 2291 "dhcp6_parser.yy" // lalr1.cc:907
+  case 658:
+#line 2292 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3688,24 +3688,24 @@ namespace isc { namespace dhcp {
 #line 3689 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 658:
-#line 2295 "dhcp6_parser.yy" // lalr1.cc:907
+  case 659:
+#line 2296 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.stack_.pop_back();
 }
 #line 3697 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 665:
-#line 2309 "dhcp6_parser.yy" // lalr1.cc:907
+  case 666:
+#line 2310 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3705 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 666:
-#line 2311 "dhcp6_parser.yy" // lalr1.cc:907
+  case 667:
+#line 2312 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
@@ -3714,8 +3714,8 @@ namespace isc { namespace dhcp {
 #line 3715 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 667:
-#line 2317 "dhcp6_parser.yy" // lalr1.cc:907
+  case 668:
+#line 2318 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
@@ -3723,8 +3723,8 @@ namespace isc { namespace dhcp {
 #line 3724 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 668:
-#line 2322 "dhcp6_parser.yy" // lalr1.cc:907
+  case 669:
+#line 2323 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
@@ -3732,8 +3732,8 @@ namespace isc { namespace dhcp {
 #line 3733 "dhcp6_parser.cc" // lalr1.cc:907
     break;
 
-  case 669:
-#line 2327 "dhcp6_parser.yy" // lalr1.cc:907
+  case 670:
+#line 2328 "dhcp6_parser.yy" // lalr1.cc:907
     {
     ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
@@ -4000,122 +4000,123 @@ namespace isc { namespace dhcp {
   }
 
 
-  const short Dhcp6Parser::yypact_ninf_ = -820;
+  const short Dhcp6Parser::yypact_ninf_ = -826;
 
   const signed char Dhcp6Parser::yytable_ninf_ = -1;
 
   const short
   Dhcp6Parser::yypact_[] =
   {
-     425,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,   102,    46,    99,   114,
-     125,   133,   144,   148,   179,   204,   206,   217,   219,   242,
-     251,   257,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,    46,    22,    44,    45,    64,   230,    69,    33,
-     244,   205,    53,   194,   -23,   364,    81,    57,  -820,   268,
-     262,   280,   278,   287,  -820,  -820,  -820,  -820,  -820,   288,
-    -820,    56,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,   290,   301,   311,   312,   328,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,   344,  -820,  -820,  -820,  -820,
-      97,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,   345,  -820,   128,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,   346,   372,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,   135,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,   182,
-    -820,  -820,  -820,  -820,  -820,   378,  -820,   399,   403,  -820,
-    -820,  -820,  -820,  -820,  -820,   185,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,   333,   365,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,   384,  -820,  -820,   413,  -820,  -820,  -820,
-     427,  -820,  -820,   433,   439,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,   442,   445,
-    -820,  -820,  -820,  -820,   444,   450,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,   186,  -820,
-    -820,  -820,   451,  -820,  -820,   452,  -820,   453,   454,  -820,
-    -820,   455,   456,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-     225,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,   232,  -820,
-    -820,  -820,  -820,   233,  -820,  -820,  -820,    46,    46,  -820,
-     284,   457,   458,   460,   461,   463,  -820,    44,  -820,    57,
-     464,   465,   466,   467,   468,   302,   305,   306,   307,   308,
-     471,   476,   477,   478,   479,   480,   494,   498,   499,   500,
-     503,   504,   505,   506,   507,   508,   342,   511,   512,   513,
-      45,  -820,   514,   347,    64,  -820,   515,   520,   521,   522,
-     523,   357,   356,   526,   527,   528,   531,   230,  -820,   532,
-      69,  -820,   533,   367,   535,   369,   375,    33,  -820,   539,
-     543,   544,   546,   547,   548,   551,  -820,   244,  -820,   553,
-     554,   389,   555,   557,   558,   390,  -820,    53,   560,   394,
-     396,  -820,   194,   566,   567,   106,  -820,   400,   568,   570,
-     404,   572,   406,   407,   591,   592,   424,   426,   594,   596,
-     598,   599,   364,  -820,   600,    81,  -820,   601,    57,  -820,
-    -820,  -820,   602,   603,   604,    46,    46,    46,  -820,   245,
-     605,   606,   607,   608,   611,  -820,  -820,  -820,  -820,  -820,
-     438,   612,   613,   614,   615,   459,   616,   618,   619,   620,
-     621,   622,   625,   626,   627,   628,  -820,   629,   615,   630,
-    -820,   633,  -820,  -820,   634,   635,   462,   472,   473,  -820,
-    -820,   359,   633,   474,   638,  -820,   481,  -820,   482,  -820,
-     483,  -820,  -820,  -820,   633,   633,   633,   484,   485,   486,
-     487,  -820,   488,   489,  -820,   490,   491,   492,  -820,  -820,
-     493,  -820,  -820,  -820,   495,    46,  -820,  -820,   496,   497,
-    -820,   501,  -820,  -820,   -61,   510,  -820,  -820,   -25,   502,
-     509,   516,  -820,   636,  -820,   642,  -820,    46,    45,    81,
-    -820,  -820,  -820,  -820,    57,    64,   143,   143,   641,  -820,
-     643,   657,   661,  -820,  -820,  -820,   662,   -31,    46,   237,
-     525,   663,   666,   667,   218,   118,    84,  -820,   364,  -820,
-    -820,   668,   669,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,   -19,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,   670,   641,
-    -820,   249,   258,   259,   270,  -820,  -820,  -820,  -820,   645,
-     674,   676,   677,   678,  -820,   679,   680,  -820,   681,   683,
-     684,  -820,   277,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,   300,  -820,   685,   617,  -820,  -820,   686,   623,  -820,
-    -820,   687,   691,  -820,  -820,   689,   693,  -820,  -820,   692,
-     694,  -820,  -820,  -820,   138,  -820,  -820,  -820,   695,  -820,
-    -820,  -820,   160,  -820,  -820,  -820,  -820,   303,  -820,  -820,
-    -820,   377,  -820,  -820,   696,   697,  -820,  -820,   698,   700,
-    -820,   701,   702,   703,   704,   705,   706,   304,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,   707,   708,   709,
-    -820,  -820,  -820,  -820,   336,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,   337,  -820,  -820,  -820,
-     348,   519,  -820,   710,   711,  -820,  -820,   712,   714,  -820,
-    -820,  -820,   682,  -820,  -820,   410,  -820,   713,  -820,  -820,
-    -820,  -820,   716,   717,   718,   719,   556,   436,   559,   542,
-     561,   720,   562,   563,   721,   564,   565,   569,   143,  -820,
-    -820,   143,  -820,   641,   230,  -820,   643,    53,  -820,   657,
-     194,  -820,   661,   379,  -820,   662,   -31,  -820,  -820,   237,
-    -820,   722,   525,  -820,   190,   663,  -820,   244,  -820,   666,
-     -23,  -820,   667,   573,   574,   575,   576,   577,   578,   218,
-    -820,   724,   725,   579,   580,   581,   118,  -820,   727,   733,
-      84,  -820,  -820,  -820,   732,   736,    69,  -820,   668,    33,
-    -820,   669,   737,  -820,   134,   670,  -820,  -820,   416,   529,
-     583,   584,  -820,  -820,  -820,  -820,  -820,   585,  -820,  -820,
-     586,  -820,  -820,  -820,  -820,   349,  -820,   358,  -820,   735,
-    -820,   749,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,   366,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,   588,  -820,  -820,   755,  -820,
-    -820,  -820,  -820,  -820,   752,   758,  -820,  -820,  -820,  -820,
-    -820,   754,  -820,   381,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,   -27,   593,  -820,  -820,  -820,  -820,   595,   610,
-    -820,  -820,   650,   388,  -820,   391,  -820,   653,  -820,   762,
-    -820,  -820,  -820,  -820,  -820,   401,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,   379,  -820,  -820,   764,   640,
-    -820,   190,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,   765,   655,   767,   134,  -820,
-    -820,   659,  -820,  -820,   770,  -820,   665,  -820,  -820,   771,
-    -820,  -820,   437,  -820,     8,   771,  -820,  -820,   768,   773,
-     777,   420,  -820,  -820,  -820,  -820,  -820,  -820,   780,   654,
-     660,   672,     8,  -820,   675,  -820,  -820,  -820,  -820,  -820
+     418,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,    45,    65,    44,    50,
+      58,    78,   111,   121,   141,   149,   155,   159,   163,   165,
+     184,   193,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,    65,   -78,    34,    64,    25,   236,    29,    36,
+     196,   161,   103,   198,   -49,   375,   110,    26,  -826,   183,
+     253,   261,   259,   269,  -826,  -826,  -826,  -826,  -826,   276,
+    -826,    70,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,   315,   321,   323,   339,   345,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,   355,  -826,  -826,  -826,
+    -826,    85,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,   361,  -826,   109,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,   365,   367,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,   132,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+     147,  -826,  -826,  -826,  -826,  -826,   383,  -826,   387,   414,
+    -826,  -826,  -826,  -826,  -826,  -826,   170,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,   303,   348,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,   411,  -826,  -826,   416,  -826,  -826,
+    -826,   419,  -826,  -826,   417,   350,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,   424,
+     431,  -826,  -826,  -826,  -826,   429,   423,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,   182,
+    -826,  -826,  -826,   442,  -826,  -826,   443,  -826,   444,   449,
+    -826,  -826,   450,   451,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,   189,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,   195,
+    -826,  -826,  -826,  -826,   237,  -826,  -826,  -826,    65,    65,
+    -826,   252,   454,   457,   460,   461,   462,  -826,    34,  -826,
+      26,   463,   464,   465,   466,   467,   301,   302,   305,   308,
+     309,   470,   473,   477,   478,   479,   480,   481,   483,   484,
+     485,   486,   487,   488,   489,   490,   491,   505,   340,   506,
+     508,   509,    64,  -826,   510,   346,    25,  -826,   514,   516,
+     517,   521,   522,   356,   360,   524,   528,   530,   236,  -826,
+     531,    29,  -826,   532,   366,   535,   369,   370,    36,  -826,
+     538,   539,   540,   542,   545,   547,   548,  -826,   196,  -826,
+     549,   550,   384,   552,   553,   554,   386,  -826,   103,   556,
+     389,   392,  -826,   198,   563,   564,   201,  -826,   396,   566,
+     567,   420,   584,   421,   425,   585,   586,   426,   428,   589,
+     590,   591,   598,   375,  -826,   599,   110,  -826,   600,    26,
+    -826,  -826,  -826,   601,   603,   604,    65,    65,    65,  -826,
+     263,   605,   606,   607,   608,   602,  -826,  -826,  -826,  -826,
+    -826,   436,   611,   612,   613,   614,   438,   157,   615,   617,
+     618,   619,   620,   621,   623,   624,   625,   626,  -826,   627,
+     614,   628,  -826,   631,  -826,  -826,   632,   633,   455,   469,
+     471,  -826,  -826,   631,   472,   636,  -826,   474,  -826,   475,
+    -826,   476,  -826,  -826,  -826,   631,   631,   631,   482,   492,
+     493,   494,  -826,   495,   496,  -826,   497,   498,   499,  -826,
+    -826,   500,  -826,  -826,  -826,   501,    65,  -826,  -826,   502,
+     503,  -826,   504,  -826,  -826,    47,   511,  -826,  -826,   -13,
+     507,   512,   513,  -826,   635,  -826,   643,  -826,    65,    64,
+     110,  -826,  -826,  -826,  -826,    26,    25,   191,   191,   642,
+    -826,   644,   646,   647,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,   648,    -7,    65,   150,   537,   649,   650,   651,
+     232,   146,    -3,  -826,   375,  -826,  -826,   652,   653,  -826,
+    -826,  -826,  -826,  -826,   -48,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,   654,
+     642,  -826,   266,   288,   289,   306,  -826,  -826,  -826,  -826,
+     671,   672,   674,   675,   676,  -826,   677,   680,  -826,   681,
+     682,   683,  -826,   307,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,   310,  -826,   684,   685,  -826,  -826,   686,   688,
+    -826,  -826,   687,   691,  -826,  -826,   689,   693,  -826,  -826,
+     692,   694,  -826,  -826,  -826,    83,  -826,  -826,  -826,   695,
+    -826,  -826,  -826,   143,  -826,  -826,  -826,  -826,   314,  -826,
+    -826,  -826,   249,  -826,  -826,   696,   697,  -826,  -826,   698,
+     700,  -826,   701,   702,   703,   704,   705,   706,   318,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,   707,   708,
+     709,  -826,  -826,  -826,  -826,   337,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,   338,  -826,  -826,
+    -826,   347,   519,  -826,   710,   711,  -826,  -826,   712,   714,
+    -826,  -826,  -826,   622,  -826,  -826,   278,  -826,   713,  -826,
+    -826,  -826,  -826,   716,   717,   718,   719,   544,   526,   555,
+     551,   557,   721,   558,   559,   723,   560,   561,   562,   191,
+    -826,  -826,   191,  -826,   642,   236,  -826,   644,   103,  -826,
+     646,   198,  -826,   647,   391,  -826,   648,    -7,  -826,  -826,
+     150,  -826,   729,   537,  -826,   128,   649,  -826,   196,  -826,
+     650,   -49,  -826,   651,   565,   568,   569,   570,   571,   572,
+     232,  -826,   730,   733,   573,   574,   575,   146,  -826,   734,
+     743,    -3,  -826,  -826,  -826,   742,   746,    29,  -826,   652,
+      36,  -826,   653,   747,  -826,   264,   654,  -826,  -826,   422,
+     580,   582,   583,  -826,  -826,  -826,  -826,  -826,   587,  -826,
+    -826,   588,  -826,  -826,  -826,  -826,   349,  -826,   359,  -826,
+     748,  -826,   751,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,   378,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,   592,  -826,  -826,   750,
+    -826,  -826,  -826,  -826,  -826,   752,   758,  -826,  -826,  -826,
+    -826,  -826,   755,  -826,   385,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,   342,   594,  -826,  -826,  -826,  -826,   596,
+     597,  -826,  -826,   609,   395,  -826,   397,  -826,   616,  -826,
+     765,  -826,  -826,  -826,  -826,  -826,   405,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,   391,  -826,  -826,   766,
+     641,  -826,   128,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,   768,   630,   769,   264,
+    -826,  -826,   634,  -826,  -826,   645,  -826,   655,  -826,  -826,
+     781,  -826,  -826,   336,  -826,   -12,   781,  -826,  -826,   772,
+     785,   794,   413,  -826,  -826,  -826,  -826,  -826,  -826,   801,
+     659,   657,   665,   -12,  -826,   667,  -826,  -826,  -826,  -826,
+    -826
   };
 
   const unsigned short
@@ -4125,155 +4126,156 @@ namespace isc { namespace dhcp {
       20,    22,    24,    26,    28,    30,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     1,    47,    40,    36,    35,    32,    33,    34,
-      39,     3,    37,    38,    60,     5,    72,     7,   116,     9,
-     257,    11,   403,    13,   428,    15,   458,    17,   328,    19,
-     336,    21,   373,    23,   222,    25,   557,    27,   630,    29,
-     620,    31,    49,    43,     0,     0,     0,     0,     0,     0,
-     460,     0,   338,   375,     0,     0,     0,     0,    51,     0,
-      50,     0,     0,    44,    70,   628,   610,   612,   614,     0,
-      69,     0,    62,    64,    66,    67,    68,    65,   616,   618,
-     114,   128,   130,   132,     0,     0,     0,     0,     0,   112,
-     249,   326,   365,   416,   418,   299,   195,   212,   203,   188,
-     495,   450,   214,   233,   516,     0,   540,   553,   555,   106,
-       0,    74,    76,    77,    78,    79,    80,   105,    83,    84,
-      85,    86,   102,    87,    89,    88,    93,    94,    81,    82,
-      91,    92,   100,   101,   103,    90,    95,    96,    97,    98,
-      99,   104,   125,     0,   124,     0,   118,   120,   121,   122,
-     123,   395,   420,   281,   283,   285,     0,     0,   291,   289,
-     287,   489,   280,   261,   262,   263,   264,     0,   259,   268,
-     269,   270,   273,   274,   276,   271,   272,   265,   266,   278,
-     279,   267,   275,   277,   414,   413,   409,   410,   408,     0,
-     405,   407,   411,   412,   443,     0,   446,     0,     0,   442,
-     436,   437,   435,   440,   441,     0,   430,   432,   433,   438,
-     439,   434,   487,   475,   477,   479,   481,   483,   485,   474,
-     471,   472,   473,     0,   461,   462,   466,   467,   464,   468,
-     469,   470,   465,     0,   355,   173,     0,   359,   357,   362,
-       0,   351,   352,     0,   339,   340,   342,   354,   343,   344,
-     345,   361,   346,   347,   348,   349,   350,   389,     0,     0,
-     387,   388,   391,   392,     0,   376,   377,   379,   380,   381,
-     382,   383,   384,   385,   386,   229,   231,   226,     0,   224,
-     227,   228,     0,   580,   582,     0,   585,     0,     0,   589,
-     593,     0,     0,   597,   604,   606,   608,   578,   576,   577,
-       0,   559,   561,   562,   563,   564,   565,   566,   567,   568,
-     569,   570,   571,   572,   573,   574,   575,   635,     0,   632,
-     634,   626,   625,     0,   622,   624,    48,     0,     0,    41,
-       0,     0,     0,     0,     0,     0,    59,     0,    61,     0,
+      39,     3,    37,    38,    60,     5,    72,     7,   117,     9,
+     258,    11,   404,    13,   429,    15,   459,    17,   329,    19,
+     337,    21,   374,    23,   223,    25,   558,    27,   631,    29,
+     621,    31,    49,    43,     0,     0,     0,     0,     0,     0,
+     461,     0,   339,   376,     0,     0,     0,     0,    51,     0,
+      50,     0,     0,    44,    70,   629,   611,   613,   615,     0,
+      69,     0,    62,    64,    66,    67,    68,    65,   617,   619,
+     115,   129,   131,   133,     0,     0,     0,     0,     0,   113,
+     250,   327,   366,   417,   419,   292,   300,   196,   213,   204,
+     189,   496,   451,   215,   234,   517,     0,   541,   554,   556,
+     107,     0,    74,    76,    77,    78,    79,    80,   105,    83,
+      84,    85,    86,   102,    87,    89,    88,    93,    94,    81,
+     106,    82,    91,    92,   100,   101,   103,    90,    95,    96,
+      97,    98,    99,   104,   126,     0,   125,     0,   119,   121,
+     122,   123,   124,   396,   421,   282,   284,   286,     0,     0,
+     290,   288,   490,   281,   262,   263,   264,   265,     0,   260,
+     269,   270,   271,   274,   275,   277,   272,   273,   266,   267,
+     279,   280,   268,   276,   278,   415,   414,   410,   411,   409,
+       0,   406,   408,   412,   413,   444,     0,   447,     0,     0,
+     443,   437,   438,   436,   441,   442,     0,   431,   433,   434,
+     439,   440,   435,   488,   476,   478,   480,   482,   484,   486,
+     475,   472,   473,   474,     0,   462,   463,   467,   468,   465,
+     469,   470,   471,   466,     0,   356,   174,     0,   360,   358,
+     363,     0,   352,   353,     0,   340,   341,   343,   355,   344,
+     345,   346,   362,   347,   348,   349,   350,   351,   390,     0,
+       0,   388,   389,   392,   393,     0,   377,   378,   380,   381,
+     382,   383,   384,   385,   386,   387,   230,   232,   227,     0,
+     225,   228,   229,     0,   581,   583,     0,   586,     0,     0,
+     590,   594,     0,     0,   598,   605,   607,   609,   579,   577,
+     578,     0,   560,   562,   563,   564,   565,   566,   567,   568,
+     569,   570,   571,   572,   573,   574,   575,   576,   636,     0,
+     633,   635,   627,   626,     0,   623,   625,    48,     0,     0,
+      41,     0,     0,     0,     0,     0,     0,    59,     0,    61,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    73,     0,     0,     0,   117,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   258,     0,
-       0,   404,     0,     0,     0,     0,     0,     0,   429,     0,
-       0,     0,     0,     0,     0,     0,   459,     0,   329,     0,
-       0,     0,     0,     0,     0,     0,   337,     0,     0,     0,
-       0,   374,     0,     0,     0,     0,   223,     0,     0,     0,
+       0,     0,     0,    73,     0,     0,     0,   118,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   259,
+       0,     0,   405,     0,     0,     0,     0,     0,     0,   430,
+       0,     0,     0,     0,     0,     0,     0,   460,     0,   330,
+       0,     0,     0,     0,     0,     0,     0,   338,     0,     0,
+       0,     0,   375,     0,     0,     0,     0,   224,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   558,     0,     0,   631,     0,     0,   621,
-      52,    45,     0,     0,     0,     0,     0,     0,    63,     0,
-       0,     0,     0,     0,     0,   107,   108,   109,   110,   111,
+       0,     0,     0,     0,   559,     0,     0,   632,     0,     0,
+     622,    52,    45,     0,     0,     0,     0,     0,     0,    63,
+       0,     0,     0,     0,     0,     0,   108,   109,   110,   111,
+     112,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   540,     0,
+       0,     0,    75,     0,   128,   120,     0,     0,     0,     0,
+       0,   298,   299,     0,     0,     0,   261,     0,   407,     0,
+     446,     0,   449,   450,   432,     0,     0,     0,     0,     0,
+       0,     0,   464,     0,     0,   354,     0,     0,     0,   365,
+     342,     0,   394,   395,   379,     0,     0,   226,   580,     0,
+       0,   585,     0,   588,   589,     0,     0,   596,   597,     0,
+       0,     0,     0,   561,     0,   634,     0,   624,     0,     0,
+       0,   612,   614,   616,   618,     0,     0,     0,     0,   135,
+     114,   252,   331,   368,    42,   418,   420,   294,   295,   296,
+     297,   293,   302,     0,    49,     0,     0,     0,   453,   217,
+       0,     0,     0,   555,     0,    53,   127,   398,   423,   283,
+     285,   287,   291,   289,     0,   416,   445,   448,   489,   477,
+     479,   481,   483,   485,   487,   357,   175,   361,   359,   364,
+     391,   231,   233,   582,   584,   587,   592,   593,   591,   595,
+     600,   601,   602,   603,   604,   599,   606,   608,   610,     0,
+     135,    46,     0,     0,     0,     0,   161,   167,   169,   171,
+       0,     0,     0,     0,     0,   184,     0,     0,   187,     0,
+       0,     0,   160,     0,   141,   143,   144,   145,   146,   147,
+     148,   149,   150,   151,   152,   155,   156,   157,   158,   153,
+     154,   159,     0,   139,     0,   136,   137,   256,     0,   253,
+     254,   335,     0,   332,   333,   372,     0,   369,   370,   306,
+       0,   303,   304,   202,   203,     0,   198,   200,   201,     0,
+     211,   212,   208,     0,   206,   209,   210,   194,     0,   191,
+     193,   500,     0,   498,   457,     0,   454,   455,   221,     0,
+     218,   219,     0,     0,     0,     0,     0,     0,     0,   236,
+     238,   239,   240,   241,   242,   243,   530,   536,     0,     0,
+       0,   529,   526,   527,   528,     0,   519,   521,   524,   522,
+     523,   525,   550,   552,   549,   547,   548,     0,   543,   545,
+     546,     0,    55,   402,     0,   399,   400,   427,     0,   424,
+     425,   494,   493,     0,   492,   640,     0,   638,     0,    71,
+     630,   620,   116,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   539,     0,     0,     0,
-      75,     0,   127,   119,     0,     0,     0,     0,     0,   297,
-     298,     0,     0,     0,     0,   260,     0,   406,     0,   445,
-       0,   448,   449,   431,     0,     0,     0,     0,     0,     0,
-       0,   463,     0,     0,   353,     0,     0,     0,   364,   341,
-       0,   393,   394,   378,     0,     0,   225,   579,     0,     0,
-     584,     0,   587,   588,     0,     0,   595,   596,     0,     0,
-       0,     0,   560,     0,   633,     0,   623,     0,     0,     0,
-     611,   613,   615,   617,     0,     0,     0,     0,   134,   113,
-     251,   330,   367,    42,   417,   419,   301,     0,    49,     0,
-       0,     0,   452,   216,     0,     0,     0,   554,     0,    53,
-     126,   397,   422,   282,   284,   286,   293,   294,   295,   296,
-     292,   290,   288,     0,   415,   444,   447,   488,   476,   478,
-     480,   482,   484,   486,   356,   174,   360,   358,   363,   390,
-     230,   232,   581,   583,   586,   591,   592,   590,   594,   599,
-     600,   601,   602,   603,   598,   605,   607,   609,     0,   134,
-      46,     0,     0,     0,     0,   160,   166,   168,   170,     0,
-       0,     0,     0,     0,   183,     0,     0,   186,     0,     0,
-       0,   159,     0,   140,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   154,   155,   156,   157,   152,   153,
-     158,     0,   138,     0,   135,   136,   255,     0,   252,   253,
-     334,     0,   331,   332,   371,     0,   368,   369,   305,     0,
-     302,   303,   201,   202,     0,   197,   199,   200,     0,   210,
-     211,   207,     0,   205,   208,   209,   193,     0,   190,   192,
-     499,     0,   497,   456,     0,   453,   454,   220,     0,   217,
-     218,     0,     0,     0,     0,     0,     0,     0,   235,   237,
-     238,   239,   240,   241,   242,   529,   535,     0,     0,     0,
-     528,   525,   526,   527,     0,   518,   520,   523,   521,   522,
-     524,   549,   551,   548,   546,   547,     0,   542,   544,   545,
-       0,    55,   401,     0,   398,   399,   426,     0,   423,   424,
-     493,   492,     0,   491,   639,     0,   637,     0,    71,   629,
-     619,   115,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   129,
-     131,     0,   133,     0,     0,   250,     0,   338,   327,     0,
-     375,   366,     0,     0,   300,     0,     0,   196,   213,     0,
-     204,     0,     0,   189,   501,     0,   496,   460,   451,     0,
-       0,   215,     0,     0,     0,     0,     0,     0,     0,     0,
-     234,     0,     0,     0,     0,     0,     0,   517,     0,     0,
-       0,   541,   556,    57,     0,    56,     0,   396,     0,     0,
-     421,     0,     0,   490,     0,     0,   636,   627,     0,     0,
-       0,     0,   172,   175,   176,   177,   178,     0,   185,   179,
-       0,   180,   181,   182,   141,     0,   137,     0,   254,     0,
-     333,     0,   370,   325,   320,   322,   313,   314,   309,   310,
-     311,   312,   318,   319,   317,   321,     0,   307,   315,   323,
-     324,   316,   304,   198,   206,     0,   191,   513,     0,   511,
-     512,   508,   509,   510,     0,   502,   503,   505,   506,   507,
-     498,     0,   455,     0,   219,   243,   244,   245,   246,   247,
-     248,   236,     0,     0,   534,   537,   538,   519,     0,     0,
-     543,    54,     0,     0,   400,     0,   425,     0,   653,     0,
-     651,   649,   643,   647,   648,     0,   641,   645,   646,   644,
-     638,   162,   163,   164,   165,   161,   167,   169,   171,   184,
-     187,   139,   256,   335,   372,     0,   306,   194,     0,     0,
-     500,     0,   457,   221,   531,   532,   533,   530,   536,   550,
-     552,    58,   402,   427,   494,     0,     0,     0,     0,   640,
-     308,     0,   515,   504,     0,   650,     0,   642,   514,     0,
-     652,   657,     0,   655,     0,     0,   654,   665,     0,     0,
-       0,     0,   659,   661,   662,   663,   664,   656,     0,     0,
-       0,     0,     0,   658,     0,   667,   668,   669,   660,   666
+     130,   132,     0,   134,     0,     0,   251,     0,   339,   328,
+       0,   376,   367,     0,     0,   301,     0,     0,   197,   214,
+       0,   205,     0,     0,   190,   502,     0,   497,   461,   452,
+       0,     0,   216,     0,     0,     0,     0,     0,     0,     0,
+       0,   235,     0,     0,     0,     0,     0,     0,   518,     0,
+       0,     0,   542,   557,    57,     0,    56,     0,   397,     0,
+       0,   422,     0,     0,   491,     0,     0,   637,   628,     0,
+       0,     0,     0,   173,   176,   177,   178,   179,     0,   186,
+     180,     0,   181,   182,   183,   142,     0,   138,     0,   255,
+       0,   334,     0,   371,   326,   321,   323,   314,   315,   310,
+     311,   312,   313,   319,   320,   318,   322,     0,   308,   316,
+     324,   325,   317,   305,   199,   207,     0,   192,   514,     0,
+     512,   513,   509,   510,   511,     0,   503,   504,   506,   507,
+     508,   499,     0,   456,     0,   220,   244,   245,   246,   247,
+     248,   249,   237,     0,     0,   535,   538,   539,   520,     0,
+       0,   544,    54,     0,     0,   401,     0,   426,     0,   654,
+       0,   652,   650,   644,   648,   649,     0,   642,   646,   647,
+     645,   639,   163,   164,   165,   166,   162,   168,   170,   172,
+     185,   188,   140,   257,   336,   373,     0,   307,   195,     0,
+       0,   501,     0,   458,   222,   532,   533,   534,   531,   537,
+     551,   553,    58,   403,   428,   495,     0,     0,     0,     0,
+     641,   309,     0,   516,   505,     0,   651,     0,   643,   515,
+       0,   653,   658,     0,   656,     0,     0,   655,   666,     0,
+       0,     0,     0,   660,   662,   663,   664,   665,   657,     0,
+       0,     0,     0,     0,   659,     0,   668,   669,   670,   661,
+     667
   };
 
   const short
   Dhcp6Parser::yypgoto_[] =
   {
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,    14,  -820,  -447,
-    -820,   115,  -820,  -820,  -820,  -820,   132,  -820,  -337,  -820,
-    -820,  -820,   -74,  -820,  -820,  -820,   432,  -820,  -820,  -820,
-    -820,   199,   392,   -70,   -58,   -55,   -38,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,   216,   429,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,   169,  -820,    -4,  -820,  -573,
-       6,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,   -46,  -820,  -603,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,   -15,
-    -820,  -820,  -820,  -820,  -820,    -8,  -596,  -820,  -820,  -820,
-    -820,    -9,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-     -21,  -820,  -820,  -820,   -17,   402,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,   -20,  -820,  -820,  -820,  -820,  -820,  -820,
-    -819,  -820,  -820,  -820,    10,  -820,  -820,  -820,    16,   446,
-    -820,  -820,  -815,  -820,  -813,  -820,   -34,  -820,   -32,  -820,
-    -805,  -820,  -820,  -820,  -804,  -820,  -820,  -820,  -820,    11,
-    -820,  -820,  -164,   787,  -820,  -820,  -820,  -820,  -820,    20,
-    -820,  -820,  -820,    23,  -820,   428,  -820,   -41,  -820,  -820,
-    -820,  -820,  -820,   -40,  -820,  -820,  -820,  -820,  -820,   -12,
-    -820,  -820,  -820,    19,  -820,  -820,  -820,    24,  -820,   421,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,   -26,  -820,  -820,  -820,   -18,   469,  -820,  -820,   -62,
-    -820,   -50,  -820,  -820,  -820,  -820,  -820,   -24,  -820,  -820,
-    -820,   -16,   449,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-     -36,  -820,  -820,  -820,    12,  -820,  -820,  -820,    13,  -820,
-     448,   246,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -803,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,    17,  -820,  -820,  -820,  -145,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,     2,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,     0,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,   273,
-     422,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,
-    -820,  -820,  -820,  -820,  -820,  -820,  -820,  -820,  -344,   414,
-    -820,  -820,  -820,  -820,  -820,  -820,   309,   418,  -820,  -820,
-    -820,   -10,  -820,  -820,  -152,  -820,  -820,  -820,  -820,  -820,
-    -820,  -168,  -820,  -820,  -183,  -820,  -820,  -820,  -820,  -820
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,    43,  -826,  -441,
+    -826,   235,  -826,  -826,  -826,  -826,   192,  -826,  -414,  -826,
+    -826,  -826,   -74,  -826,  -826,  -826,   447,  -826,  -826,  -826,
+    -826,   227,   446,   -62,   -46,   -45,   -43,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,   223,   432,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,   175,  -826,    -4,  -826,  -572,
+     -19,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,   -70,  -826,  -605,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,   -17,
+    -826,  -826,  -826,  -826,  -826,    -8,  -592,  -826,  -826,  -826,
+    -826,   -10,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+     -22,  -826,  -826,  -826,   -18,   399,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,   -28,  -826,  -826,  -826,  -826,  -826,  -826,
+    -825,  -826,  -826,  -826,     9,  -826,  -826,  -826,    13,   441,
+    -826,  -826,  -824,  -826,  -821,  -826,   -36,  -826,   -32,  -826,
+     -42,  -826,  -826,  -826,  -818,  -826,  -826,  -826,  -826,     4,
+    -826,  -826,  -164,   788,  -826,  -826,  -826,  -826,  -826,    16,
+    -826,  -826,  -826,    22,  -826,   427,  -826,   -76,  -826,  -826,
+    -826,  -826,  -826,   -69,  -826,  -826,  -826,  -826,  -826,   -11,
+    -826,  -826,  -826,    18,  -826,  -826,  -826,    21,  -826,   430,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,   -25,  -826,  -826,  -826,   -20,   458,  -826,  -826,   -58,
+    -826,   -24,  -826,  -826,  -826,  -826,  -826,   -15,  -826,  -826,
+    -826,   -16,   452,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+     -60,  -826,  -826,  -826,     8,  -826,  -826,  -826,    14,  -826,
+     453,   251,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -817,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,    24,  -826,  -826,  -826,  -144,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,     5,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,     2,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,   270,
+     433,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,
+    -826,  -826,  -826,  -826,  -826,  -826,  -826,  -826,  -342,   434,
+    -826,  -826,  -826,  -826,  -826,  -826,   311,   435,  -826,  -826,
+    -826,    -9,  -826,  -826,  -154,  -826,  -826,  -826,  -826,  -826,
+    -826,  -170,  -826,  -826,  -185,  -826,  -826,  -826,  -826,  -826
   };
 
   const short
@@ -4281,257 +4283,259 @@ namespace isc { namespace dhcp {
   {
       -1,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    88,    41,    42,
-      73,   604,    92,    93,    43,    72,    89,    90,   620,   801,
-     894,   895,   352,    45,    74,   101,   102,   103,   361,    47,
-      75,   140,   141,   142,   143,   144,   145,   146,   147,   380,
-     148,   371,    49,    76,   175,   176,   177,   402,   178,   149,
-     372,   150,   373,   151,   374,   713,   714,   715,   841,   692,
-     693,   694,   822,  1015,   695,   823,   696,   824,   697,   825,
-     698,   699,   440,   700,   701,   702,   703,   704,   705,   706,
-     707,   708,   831,   709,   710,   834,   152,   390,   747,   748,
-     749,   861,   153,   387,   734,   735,   736,   737,   154,   389,
-     742,   743,   744,   745,   155,   388,   156,   393,   758,   759,
-     760,   870,    65,    84,   308,   309,   310,   453,   311,   454,
-     157,   394,   767,   768,   769,   770,   771,   772,   773,   774,
-     158,   381,   717,   718,   719,   844,    51,    77,   197,   198,
-     199,   408,   200,   409,   201,   410,   202,   415,   203,   414,
-     204,   413,   630,   205,   206,   159,   386,   729,   730,   731,
-     853,   946,   947,   160,   382,    59,    81,   721,   722,   723,
-     847,    61,    82,   273,   274,   275,   276,   277,   278,   279,
-     439,   280,   443,   281,   442,   282,   283,   444,   284,   161,
-     383,   725,   726,   727,   850,    63,    83,   294,   295,   296,
-     297,   298,   448,   299,   300,   301,   302,   208,   406,   803,
-     804,   805,   896,    53,    78,   219,   220,   221,   419,   162,
-     384,   163,   385,   211,   407,   807,   808,   809,   899,    55,
-      79,   235,   236,   237,   422,   238,   239,   424,   240,   241,
-     164,   392,   754,   755,   756,   867,    57,    80,   253,   254,
-     255,   256,   430,   257,   431,   258,   432,   259,   433,   260,
-     434,   261,   435,   262,   429,   213,   416,   812,   813,   902,
-     165,   391,   751,   752,   864,   964,   965,   966,   967,   968,
-    1028,   969,   166,   395,   784,   785,   786,   881,  1037,   787,
-     788,   882,   789,   790,   167,   168,   397,   796,   797,   798,
-     888,   799,   889,   169,   398,   170,   399,    67,    85,   330,
-     331,   332,   333,   458,   334,   459,   335,   336,   461,   337,
-     338,   339,   464,   657,   340,   465,   341,   342,   343,   468,
-     664,   344,   469,   345,   470,   346,   471,   104,   363,   105,
-     364,   106,   365,   171,   369,   370,    71,    87,   353,   354,
-     355,   477,   107,   362,    69,    86,   348,   349,   350,   474,
-     815,   816,   904,  1005,  1006,  1007,  1008,  1047,  1009,  1045,
-    1062,  1063,  1064,  1071,  1072,  1073,  1078,  1074,  1075,  1076
+      73,   605,    92,    93,    43,    72,    89,    90,   626,   802,
+     895,   896,   353,    45,    74,   101,   102,   103,   362,    47,
+      75,   141,   142,   143,   144,   145,   146,   147,   148,   381,
+     149,   372,    49,    76,   177,   178,   179,   404,   180,   150,
+     373,   151,   374,   152,   375,   714,   715,   716,   842,   693,
+     694,   695,   823,  1016,   696,   824,   697,   825,   698,   826,
+     699,   700,   441,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   832,   710,   711,   835,   153,   392,   748,   749,
+     750,   862,   154,   389,   735,   736,   737,   738,   155,   391,
+     743,   744,   745,   746,   156,   390,   157,   395,   759,   760,
+     761,   871,    65,    84,   309,   310,   311,   454,   312,   455,
+     158,   396,   768,   769,   770,   771,   772,   773,   774,   775,
+     159,   382,   718,   719,   720,   845,    51,    77,   198,   199,
+     200,   410,   201,   411,   202,   412,   203,   416,   204,   415,
+     160,   387,   611,   206,   207,   161,   388,   730,   731,   732,
+     854,   947,   948,   162,   383,    59,    81,   722,   723,   724,
+     848,    61,    82,   274,   275,   276,   277,   278,   279,   280,
+     440,   281,   444,   282,   443,   283,   284,   445,   285,   163,
+     384,   726,   727,   728,   851,    63,    83,   295,   296,   297,
+     298,   299,   449,   300,   301,   302,   303,   209,   408,   804,
+     805,   806,   897,    53,    78,   220,   221,   222,   420,   164,
+     385,   165,   386,   212,   409,   808,   809,   810,   900,    55,
+      79,   236,   237,   238,   423,   239,   240,   425,   241,   242,
+     166,   394,   755,   756,   757,   868,    57,    80,   254,   255,
+     256,   257,   431,   258,   432,   259,   433,   260,   434,   261,
+     435,   262,   436,   263,   430,   214,   417,   813,   814,   903,
+     167,   393,   752,   753,   865,   965,   966,   967,   968,   969,
+    1029,   970,   168,   397,   785,   786,   787,   882,  1038,   788,
+     789,   883,   790,   791,   169,   170,   399,   797,   798,   799,
+     889,   800,   890,   171,   400,   172,   401,    67,    85,   331,
+     332,   333,   334,   459,   335,   460,   336,   337,   462,   338,
+     339,   340,   465,   658,   341,   466,   342,   343,   344,   469,
+     665,   345,   470,   346,   471,   347,   472,   104,   364,   105,
+     365,   106,   366,   173,   370,   371,    71,    87,   354,   355,
+     356,   478,   107,   363,    69,    86,   349,   350,   351,   475,
+     816,   817,   905,  1006,  1007,  1008,  1009,  1048,  1010,  1046,
+    1063,  1064,  1065,  1072,  1073,  1074,  1079,  1075,  1076,  1077
   };
 
   const unsigned short
   Dhcp6Parser::yytable_[] =
   {
-     100,   139,   174,   192,   215,   229,   249,   193,   271,   290,
-     307,   327,   781,   741,   179,   209,   222,   233,   251,   194,
-     285,   303,   195,   328,   711,   489,   180,   210,   223,   234,
-     252,    40,   286,   304,   939,   329,   272,   291,   940,   196,
-     941,   212,   292,   293,   216,   230,   217,   231,   944,   945,
-     951,    33,   108,    34,    94,    35,   109,   603,   110,   367,
-     732,   111,   112,   113,   368,   207,   218,   232,   250,   351,
-     243,   603,   264,   655,   656,   305,   306,   810,   172,   173,
-     122,  1034,  1035,  1036,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   224,   225,   226,   227,   228,   123,   124,
-     400,   265,    32,   266,   267,   401,    44,   268,   269,   270,
-     123,   124,   659,   660,   661,   662,   122,   189,   123,   124,
-     190,    46,   125,   126,   127,   128,   129,   214,   130,   123,
-     124,   404,    48,   131,   123,   124,   405,   775,   417,   733,
-      50,   856,   132,   418,   857,   133,   680,    99,   663,   123,
-     124,    52,   134,   189,  1067,    54,   190,  1068,  1069,  1070,
-     135,   136,   675,   859,   137,   138,   860,   676,   677,   678,
-     679,   680,   681,   682,   683,   684,   685,   686,   687,   688,
-     689,   690,   265,   123,   124,   420,    56,    95,   427,   455,
-     421,   265,    91,   428,   456,   631,    96,    97,    98,   123,
-     124,   791,   792,    99,   305,   306,   939,   637,   638,   639,
-     940,    58,   941,    60,    99,    99,    36,    37,    38,    39,
-     944,   945,   951,    99,    62,   347,    64,    99,   472,   776,
-     777,   778,   779,   473,    99,   475,   478,   122,   265,    99,
-     476,   479,   265,   287,   266,   267,   288,   289,   478,    66,
-     673,   121,   400,   593,    99,   123,   124,   818,    68,   123,
-     124,   475,   478,   741,    70,   357,   819,   820,   925,   114,
-     115,   116,   117,   404,   356,   957,   958,   122,   821,   998,
-     838,   999,  1000,   781,   358,   839,   359,   181,    99,   182,
-     360,   122,   366,   100,   375,   123,   124,   183,   184,   185,
-     186,   187,   188,   838,    99,   376,   862,   879,   840,   123,
-     124,   863,   880,    99,   189,   377,   378,   190,   131,   761,
-     762,   763,   764,   765,   766,   191,   139,   242,   732,   739,
-     174,   740,   379,   243,   244,   245,   246,   247,   248,   886,
-     890,   436,   179,   192,   887,   891,   215,   193,   396,   403,
-     411,   472,   838,   229,   180,   209,   892,  1021,   222,   194,
-      99,   417,   195,   249,    99,   233,  1022,   210,   437,  1025,
-     223,   480,   481,   271,  1026,   251,   412,   234,   290,   196,
-     865,   212,   423,   866,   455,   285,   216,   252,   217,  1033,
-     303,   420,   438,   230,   427,   231,  1042,   286,   327,  1043,
-      99,   272,   304,   425,  1048,   207,   291,   426,   218,  1049,
-     328,   292,   293,   905,    99,   232,   906,   441,   114,   115,
-     116,   117,   329,  1082,   120,   250,   122,   265,  1083,   123,
-     124,   445,   626,   627,   628,   629,  1011,  1012,  1013,  1014,
-    1065,   446,   447,  1066,   123,   124,   449,   184,   185,   450,
-     187,   188,   451,   452,   482,   457,   460,   462,   463,   466,
-     467,   483,   484,   189,   485,   486,   190,   487,   490,   491,
-     492,   493,   494,   495,   191,   500,   496,   497,   498,   499,
-     501,   502,   503,   504,   505,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   506,   590,
-     591,   592,   507,   508,   509,   325,   326,   510,   511,   512,
-     513,   514,   515,   516,   139,   517,   518,   519,   521,   524,
-     522,   174,   691,   691,   525,   526,   527,   528,   529,   530,
-     531,   532,   533,   179,    99,   534,   536,   538,   539,   540,
-     541,   780,   793,   544,   327,   180,   542,   545,   546,    99,
-     547,   548,   549,   782,   794,   550,   328,   552,   553,   555,
-     554,   556,   557,   558,   560,   783,   795,   561,   329,   562,
-     564,   565,   568,   567,   569,   570,   571,   572,   573,   651,
-       1,     2,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,   574,   575,   576,   578,   577,
-     579,   670,   580,   581,   583,   585,   587,   746,   599,   913,
-     588,   589,   594,   595,   596,   597,   598,   600,   601,   602,
-     843,   606,    34,   607,   608,   609,   846,   611,   610,   605,
-     612,   613,   623,   617,   614,   615,   616,   618,   619,   621,
-     622,   668,   624,   625,   632,   633,   658,   669,   712,   826,
-     716,   634,   635,   636,   640,   641,   642,   643,   644,   645,
-     646,   647,   648,   649,   720,   650,   652,   653,   724,   728,
-     750,   654,   665,   753,   757,   802,   806,   814,   827,   666,
-     828,   829,   830,   832,   833,   835,   667,   836,   837,   893,
-     903,   842,   845,   848,   849,   851,   852,   855,   854,  1016,
-     869,   858,   868,   872,   871,   873,   874,   875,   876,   877,
-     878,   883,   884,   885,   898,   915,   897,   901,   900,   907,
-     908,   909,   910,   911,   917,   920,   955,   912,   982,   983,
-     914,   988,   916,   918,   919,   921,   922,   989,   991,   992,
-     738,   997,   923,  1023,   975,   976,   977,   978,   979,   980,
-     984,   985,   986,  1017,  1018,  1019,  1020,  1024,  1027,  1029,
-    1030,  1031,  1032,  1038,   691,  1039,  1046,   691,  1051,  1054,
-     192,  1056,  1079,   271,   193,  1059,   290,  1080,  1061,   933,
-    1040,  1081,   209,   934,  1084,   285,   194,   671,   303,   195,
-     959,   949,   520,   249,   210,   935,   307,   286,   936,   488,
-     304,   272,   962,   950,   291,   251,   196,   938,   212,   292,
-     293,   674,   780,  1052,   963,   937,   793,   252,   960,   942,
-    1041,   943,   215,  1044,   782,   229,  1055,  1085,   794,  1058,
-    1001,  1086,   207,   523,   222,  1060,   783,   233,   817,   926,
-     795,   948,  1003,  1087,   924,  1089,   223,   956,   953,   234,
-     954,   974,   961,   973,  1004,   250,   928,   566,  1002,   981,
-     927,  1050,   216,   535,   217,   230,   952,   231,   263,   930,
-     929,   932,   994,   563,   931,   559,   543,   996,   993,   811,
-     971,   972,   970,   995,   218,   551,  1053,   232,   987,   537,
-     990,   800,   586,   584,   582,  1010,  1057,  1077,   672,  1088,
+     100,   140,   176,   193,   216,   230,   250,   293,   272,   291,
+     308,   328,   273,   292,   294,   194,   782,   213,   181,   210,
+     223,   234,   252,   742,   286,   304,   712,   329,   490,   940,
+     941,   195,   196,   942,   197,   205,   946,   952,   352,   174,
+     175,   244,   217,   231,    94,    32,   218,   232,   811,   306,
+     307,    44,   182,   211,   224,   235,   253,    46,   287,   305,
+      40,   330,   123,   124,   604,    48,   208,   219,   233,   251,
+      33,   108,    34,   368,    35,   109,   122,   110,   369,   604,
+     111,   112,   113,   122,   733,    50,   857,   215,   402,   858,
+     123,   124,    91,   403,   123,   124,   225,   226,   227,   228,
+     229,   123,   124,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,   406,   190,   792,   793,   191,   407,    52,   632,
+     190,    99,   265,   191,   660,   661,   662,   663,    54,   123,
+     124,   638,   639,   640,  1068,   418,   125,  1069,  1070,  1071,
+     419,   126,   127,   128,   129,   130,   860,   131,    56,   861,
+     421,   266,   132,   267,   268,   422,    58,   269,   270,   271,
+     664,   133,    60,   734,   134,   776,    62,    99,   123,   124,
+      64,   135,    66,   428,   681,   122,   266,    95,   429,   136,
+     137,   656,   657,   138,   139,   456,    96,    97,    98,   357,
+     457,    68,   473,   123,   124,    99,    99,   474,   476,    99,
+      70,   940,   941,   477,    99,   942,    99,   121,   946,   952,
+     676,   123,   124,   958,   959,   677,   678,   679,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     607,   608,   609,   610,    99,    36,    37,    38,    39,   266,
+     479,   733,   740,   122,   741,   480,   266,   288,   267,   268,
+     289,   290,   866,   674,   348,   867,   358,   777,   778,   779,
+     780,   123,   124,   123,   124,   359,   479,   360,   742,   402,
+     926,   594,   361,    99,   819,   114,   115,   116,   117,   243,
+     367,   906,   782,   122,   907,   244,   245,   246,   247,   248,
+     249,   476,   479,   183,   100,   184,   820,   821,    99,   306,
+     307,   123,   124,   185,   186,   187,   188,   189,   125,   406,
+     839,   437,   266,   839,   822,   840,    99,   863,   841,   376,
+     190,   880,   864,   191,   132,   377,   881,   378,   140,   123,
+     124,   192,   176,   762,   763,   764,   765,   766,   767,  1066,
+     887,   891,  1067,   379,   193,   888,   892,   216,   181,   380,
+     473,   438,   839,   448,   230,   893,   194,  1022,   213,   398,
+     210,    99,   418,   223,   250,   405,    99,  1023,    99,   413,
+     234,   414,   195,   196,   272,   197,   205,   293,   273,   291,
+     252,  1026,   182,   292,   294,   217,  1027,   424,   456,   218,
+     286,   426,   231,  1034,   211,   304,   232,   224,   421,   328,
+     428,   481,   482,  1043,   235,  1044,    99,   208,  1049,   999,
+     219,  1000,  1001,  1050,   253,   329,  1083,   233,   427,   439,
+     442,  1084,   483,   446,   287,   447,   453,   251,   450,   305,
+     114,   115,   116,   117,    99,   451,   120,   452,   122,   266,
+     123,   124,  1012,  1013,  1014,  1015,   458,   461,   463,   330,
+    1035,  1036,  1037,   464,   467,   468,   123,   124,   484,   186,
+     187,   485,   189,   125,   486,   487,   488,   491,   492,   493,
+     494,   495,   496,   497,   501,   190,   498,   502,   191,   499,
+     500,   503,   504,   505,   506,   507,   192,   508,   509,   510,
+     511,   512,   513,   514,   515,   516,   313,   314,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,   517,
+     519,   518,   520,   521,   523,   140,   326,   327,   526,   524,
+     527,   528,   176,   692,   692,   529,   530,   531,   533,   591,
+     592,   593,   534,   532,   535,   537,   539,   540,   181,   541,
+     542,   543,   545,   546,   547,    99,   548,   781,   794,   549,
+     328,   550,   551,   553,   554,   555,   556,   557,   558,   559,
+     561,    99,   562,   783,   795,   563,   329,   565,   566,   568,
+     569,   570,   182,     1,     2,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,   572,   575,
+     576,   571,   573,   579,   580,   581,   574,   784,   796,   577,
+     330,   578,   582,   584,   586,   588,   600,   599,   606,   652,
+     589,   590,   595,   596,   597,   598,   601,   602,   603,   747,
+     612,    34,   613,   614,   615,   629,   617,   616,   618,   619,
+     904,   671,   620,   621,   622,   624,   625,   627,   628,   630,
+     669,   631,   633,   634,   635,   636,   637,   659,   670,   713,
+    1060,   717,   641,   721,   725,   729,   751,   754,   758,   803,
+     807,   815,   642,   643,   644,   645,   646,   647,   648,   649,
+     650,   651,   653,   654,   655,   827,   828,   666,   829,   830,
+     831,   833,   667,   668,   834,   836,   837,   838,   844,   894,
+     843,   847,   846,   849,   850,   852,   853,   856,   855,   914,
+     870,   859,   869,   873,   872,   874,   875,   876,   877,   878,
+     879,   884,   885,   886,   899,   913,   898,   902,   901,   908,
+     909,   910,   911,   912,   916,   918,   915,   921,   917,   919,
+     920,   922,   923,   956,   983,   924,   976,   984,   989,   977,
+     978,   979,   980,   981,   985,   986,   987,   990,   992,   993,
+    1017,   998,  1018,  1019,  1030,   623,  1024,  1020,  1021,  1025,
+    1031,  1032,  1028,  1033,  1039,   692,  1040,  1041,   692,  1047,
+    1052,   193,  1055,  1057,   272,   293,  1080,   291,   273,  1042,
+     934,   292,   294,   194,   939,   213,  1045,   210,  1062,  1081,
+     286,   960,   935,   304,   250,   961,   950,   308,  1082,   195,
+     196,  1056,   197,   205,  1059,  1085,   739,   963,   936,   937,
+     252,   938,   945,   781,  1053,   489,   672,   794,   943,   675,
+     925,   211,   944,   216,   287,  1061,   230,   305,  1087,   783,
+     951,  1002,  1086,   795,   208,  1003,  1088,  1090,   525,   223,
+     927,   964,   234,   949,   253,   818,   957,  1004,   522,   954,
+     955,   975,   982,   974,   962,   567,   929,   251,   928,   536,
+     953,   217,  1051,   784,   231,   218,   931,   796,   232,   264,
+     930,   933,   932,   224,   995,   560,   235,   994,   973,   538,
+     544,  1005,   972,   564,   996,   812,   219,   997,  1054,   233,
+     971,   552,   988,   991,   801,  1058,  1078,  1011,  1089,     0,
+       0,   673,     0,     0,     0,     0,   583,     0,     0,     0,
+       0,   585,     0,   587,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   933,     0,     0,     0,   934,     0,   959,     0,     0,
-       0,     0,     0,   949,     0,     0,     0,   935,     0,   962,
-     936,     0,     0,     0,  1001,   950,     0,     0,     0,   938,
-       0,   963,     0,     0,     0,   960,  1003,   937,     0,     0,
-       0,   942,     0,   943,     0,     0,     0,     0,  1004,     0,
-       0,     0,  1002,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   948,     0,     0,     0,     0,     0,   961
+       0,     0,   934,     0,     0,     0,   939,     0,   960,     0,
+       0,     0,   961,     0,   935,     0,     0,     0,   950,     0,
+       0,     0,     0,     0,   963,  1002,     0,     0,     0,  1003,
+     936,   937,     0,   938,   945,     0,     0,     0,     0,     0,
+     943,  1004,     0,     0,   944,     0,     0,     0,     0,     0,
+       0,     0,   951,     0,     0,     0,     0,     0,   964,     0,
+       0,     0,     0,     0,     0,   949,     0,     0,     0,     0,
+       0,   962,     0,     0,     0,  1005
   };
 
   const short
   Dhcp6Parser::yycheck_[] =
   {
-      74,    75,    76,    77,    78,    79,    80,    77,    82,    83,
-      84,    85,   615,   609,    76,    77,    78,    79,    80,    77,
-      82,    83,    77,    85,   597,   369,    76,    77,    78,    79,
-      80,    17,    82,    83,   853,    85,    82,    83,   853,    77,
-     853,    77,    83,    83,    78,    79,    78,    79,   853,   853,
-     853,     5,     7,     7,    10,     9,    11,   504,    13,     3,
-      91,    16,    17,    18,     8,    77,    78,    79,    80,    12,
-      89,   518,    19,   134,   135,    98,    99,    96,    14,    15,
-      47,   108,   109,   110,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    60,    61,    62,    63,    64,    65,    66,
-       3,    48,     0,    50,    51,     8,     7,    54,    55,    56,
-      65,    66,   137,   138,   139,   140,    47,    84,    65,    66,
-      87,     7,    77,    78,    79,    80,    81,    58,    83,    65,
-      66,     3,     7,    88,    65,    66,     8,    19,     3,   170,
-       7,     3,    97,     8,     6,   100,    28,   170,   173,    65,
-      66,     7,   107,    84,   146,     7,    87,   149,   150,   151,
-     115,   116,    19,     3,   119,   120,     6,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    48,    65,    66,     3,     7,   143,     3,     3,
-       8,    48,   170,     8,     8,   532,   152,   153,   154,    65,
-      66,   117,   118,   170,    98,    99,  1025,   544,   545,   546,
-    1025,     7,  1025,     7,   170,   170,   170,   171,   172,   173,
-    1025,  1025,  1025,   170,     7,   144,     7,   170,     3,   111,
-     112,   113,   114,     8,   170,     3,     3,    47,    48,   170,
-       8,     8,    48,    49,    50,    51,    52,    53,     3,     7,
-     594,    46,     3,     8,   170,    65,    66,     8,     7,    65,
-      66,     3,     3,   859,     7,     3,     8,     8,   841,    39,
-      40,    41,    42,     3,     6,    85,    86,    47,     8,   145,
-       3,   147,   148,   886,     4,     8,     8,    57,   170,    59,
-       3,    47,     4,   367,     4,    65,    66,    67,    68,    69,
-      70,    71,    72,     3,   170,     4,     3,     3,     8,    65,
-      66,     8,     8,   170,    84,     4,     4,    87,    88,   101,
-     102,   103,   104,   105,   106,    95,   400,    83,    91,    92,
-     404,    94,     4,    89,    90,    91,    92,    93,    94,     3,
-       3,     8,   404,   417,     8,     8,   420,   417,     4,     4,
-       4,     3,     3,   427,   404,   417,     8,     8,   420,   417,
-     170,     3,   417,   437,   170,   427,     8,   417,     3,     3,
-     420,   357,   358,   447,     8,   437,     4,   427,   452,   417,
-       3,   417,     4,     6,     3,   447,   420,   437,   420,     8,
-     452,     3,     8,   427,     3,   427,     8,   447,   472,     8,
-     170,   447,   452,     4,     3,   417,   452,     4,   420,     8,
-     472,   452,   452,     3,   170,   427,     6,     4,    39,    40,
-      41,    42,   472,     3,    45,   437,    47,    48,     8,    65,
-      66,     4,    73,    74,    75,    76,    20,    21,    22,    23,
-       3,     8,     3,     6,    65,    66,     4,    68,    69,     4,
-      71,    72,     8,     3,   170,     4,     4,     4,     4,     4,
-       4,     4,     4,    84,     4,     4,    87,     4,     4,     4,
-       4,     4,     4,   171,    95,     4,   171,   171,   171,   171,
-       4,     4,     4,     4,     4,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,     4,   485,
-     486,   487,     4,     4,     4,   141,   142,     4,     4,     4,
-       4,     4,     4,   171,   588,     4,     4,     4,     4,     4,
-     173,   595,   596,   597,     4,     4,     4,     4,   171,   173,
-       4,     4,     4,   595,   170,     4,     4,     4,   171,     4,
-     171,   615,   616,     4,   618,   595,   171,     4,     4,   170,
-       4,     4,     4,   615,   616,     4,   618,     4,     4,     4,
-     171,     4,     4,   173,     4,   615,   616,   173,   618,   173,
-       4,     4,     4,   173,     4,   171,     4,   171,   171,   565,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,     4,     4,   173,     4,   173,
-       4,   587,     4,     4,     4,     4,     4,    82,   170,   173,
-       7,     7,     7,     7,     7,     7,     5,     5,     5,     5,
-       3,     5,     7,     5,     5,     5,     3,     5,     7,   170,
-       5,     5,   170,   518,     7,     7,     7,     7,     5,     5,
-       5,     5,   170,   170,   170,     7,   136,     5,     7,     4,
-       7,   170,   170,   170,   170,   170,   170,   170,   170,   170,
-     170,   170,   170,   170,     7,   170,   170,   170,     7,     7,
-       7,   170,   170,     7,     7,     7,     7,     7,     4,   170,
-       4,     4,     4,     4,     4,     4,   170,     4,     4,   170,
-       8,     6,     6,     6,     3,     6,     3,     3,     6,   170,
+      74,    75,    76,    77,    78,    79,    80,    83,    82,    83,
+      84,    85,    82,    83,    83,    77,   621,    77,    76,    77,
+      78,    79,    80,   615,    82,    83,   598,    85,   370,   854,
+     854,    77,    77,   854,    77,    77,   854,   854,    12,    14,
+      15,    89,    78,    79,    10,     0,    78,    79,    96,    98,
+      99,     7,    76,    77,    78,    79,    80,     7,    82,    83,
+      17,    85,    65,    66,   505,     7,    77,    78,    79,    80,
+       5,     7,     7,     3,     9,    11,    47,    13,     8,   520,
+      16,    17,    18,    47,    91,     7,     3,    58,     3,     6,
+      65,    66,   170,     8,    65,    66,    60,    61,    62,    63,
+      64,    65,    66,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,     3,    84,   117,   118,    87,     8,     7,   533,
+      84,   170,    19,    87,   137,   138,   139,   140,     7,    65,
+      66,   545,   546,   547,   146,     3,    72,   149,   150,   151,
+       8,    77,    78,    79,    80,    81,     3,    83,     7,     6,
+       3,    48,    88,    50,    51,     8,     7,    54,    55,    56,
+     173,    97,     7,   170,   100,    19,     7,   170,    65,    66,
+       7,   107,     7,     3,    28,    47,    48,   143,     8,   115,
+     116,   134,   135,   119,   120,     3,   152,   153,   154,     6,
+       8,     7,     3,    65,    66,   170,   170,     8,     3,   170,
+       7,  1026,  1026,     8,   170,  1026,   170,    46,  1026,  1026,
+      19,    65,    66,    85,    86,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
+      73,    74,    75,    76,   170,   170,   171,   172,   173,    48,
+       3,    91,    92,    47,    94,     8,    48,    49,    50,    51,
+      52,    53,     3,   595,   144,     6,     3,   111,   112,   113,
+     114,    65,    66,    65,    66,     4,     3,     8,   860,     3,
+     842,     8,     3,   170,     8,    39,    40,    41,    42,    83,
+       4,     3,   887,    47,     6,    89,    90,    91,    92,    93,
+      94,     3,     3,    57,   368,    59,     8,     8,   170,    98,
+      99,    65,    66,    67,    68,    69,    70,    71,    72,     3,
+       3,     8,    48,     3,     8,     8,   170,     3,     8,     4,
+      84,     3,     8,    87,    88,     4,     8,     4,   402,    65,
+      66,    95,   406,   101,   102,   103,   104,   105,   106,     3,
+       3,     3,     6,     4,   418,     8,     8,   421,   406,     4,
+       3,     3,     3,     3,   428,     8,   418,     8,   418,     4,
+     418,   170,     3,   421,   438,     4,   170,     8,   170,     4,
+     428,     4,   418,   418,   448,   418,   418,   453,   448,   453,
+     438,     3,   406,   453,   453,   421,     8,     4,     3,   421,
+     448,     4,   428,     8,   418,   453,   428,   421,     3,   473,
+       3,   358,   359,     8,   428,     8,   170,   418,     3,   145,
+     421,   147,   148,     8,   438,   473,     3,   428,     4,     8,
+       4,     8,   170,     4,   448,     8,     3,   438,     4,   453,
+      39,    40,    41,    42,   170,     4,    45,     8,    47,    48,
+      65,    66,    20,    21,    22,    23,     4,     4,     4,   473,
+     108,   109,   110,     4,     4,     4,    65,    66,     4,    68,
+      69,     4,    71,    72,     4,     4,     4,     4,     4,     4,
+       4,     4,   171,   171,     4,    84,   171,     4,    87,   171,
+     171,     4,     4,     4,     4,     4,    95,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,     4,
+       4,   171,     4,     4,     4,   589,   141,   142,     4,   173,
+       4,     4,   596,   597,   598,     4,     4,   171,     4,   486,
+     487,   488,     4,   173,     4,     4,     4,   171,   596,     4,
+     171,   171,     4,     4,     4,   170,     4,   621,   622,     4,
+     624,     4,     4,     4,     4,   171,     4,     4,     4,   173,
+       4,   170,   173,   621,   622,   173,   624,     4,     4,   173,
+       4,     4,   596,   155,   156,   157,   158,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,     4,     4,
+       4,   171,   171,     4,     4,     4,   171,   621,   622,   173,
+     624,   173,     4,     4,     4,     4,   170,     5,   170,   566,
+       7,     7,     7,     7,     7,     7,     5,     5,     5,    82,
+       5,     7,     5,     5,     5,   170,     5,     7,     5,     5,
+       8,   588,     7,     7,     7,     7,     5,     5,     5,   170,
+       5,   170,   170,     7,   170,   170,   170,   136,     5,     7,
+       5,     7,   170,     7,     7,     7,     7,     7,     7,     7,
+       7,     7,   170,   170,   170,   170,   170,   170,   170,   170,
+     170,   170,   170,   170,   170,     4,     4,   170,     4,     4,
+       4,     4,   170,   170,     4,     4,     4,     4,     3,   170,
+       6,     3,     6,     6,     3,     6,     3,     3,     6,   173,
        3,     6,     6,     3,     6,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     3,   173,     6,     3,     6,     6,
-       4,     4,     4,     4,     4,     4,     4,   171,     4,     4,
-     171,     4,   171,   171,   171,   171,   171,     4,     6,     3,
-     608,     4,   173,     8,   171,   171,   171,   171,   171,   171,
-     171,   171,   171,   170,   170,   170,   170,     8,   170,     4,
-       8,     3,     8,   170,   838,   170,     4,   841,     4,     4,
-     844,     4,     4,   847,   844,     5,   850,     4,     7,   853,
-     170,     4,   844,   853,     4,   847,   844,   588,   850,   844,
-     864,   853,   400,   867,   844,   853,   870,   847,   853,   367,
-     850,   847,   864,   853,   850,   867,   844,   853,   844,   850,
-     850,   595,   886,   173,   864,   853,   890,   867,   864,   853,
-     170,   853,   896,   170,   886,   899,   171,   173,   890,   170,
-     904,   171,   844,   404,   896,   170,   886,   899,   669,   843,
-     890,   853,   904,   171,   838,   170,   896,   862,   856,   899,
-     859,   872,   864,   870,   904,   867,   846,   455,   904,   879,
-     844,  1025,   896,   417,   896,   899,   855,   899,    81,   849,
-     847,   852,   898,   452,   850,   447,   427,   901,   896,   633,
-     867,   869,   865,   899,   896,   437,  1031,   899,   886,   420,
-     890,   618,   478,   475,   472,   905,  1048,  1065,   589,  1082,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       4,     4,     4,     4,     3,   171,     6,     3,     6,     6,
+       4,     4,     4,     4,   173,     4,   171,     4,   171,   171,
+     171,   171,   171,     4,     4,   173,   171,     4,     4,   171,
+     171,   171,   171,   171,   171,   171,   171,     4,     6,     3,
+     170,     4,   170,   170,     4,   520,     8,   170,   170,     8,
+       8,     3,   170,     8,   170,   839,   170,   170,   842,     4,
+       4,   845,     4,     4,   848,   851,     4,   851,   848,   170,
+     854,   851,   851,   845,   854,   845,   170,   845,     7,     4,
+     848,   865,   854,   851,   868,   865,   854,   871,     4,   845,
+     845,   171,   845,   845,   170,     4,   614,   865,   854,   854,
+     868,   854,   854,   887,   173,   368,   589,   891,   854,   596,
+     839,   845,   854,   897,   848,   170,   900,   851,   171,   887,
+     854,   905,   173,   891,   845,   905,   171,   170,   406,   897,
+     844,   865,   900,   854,   868,   670,   863,   905,   402,   857,
+     860,   873,   880,   871,   865,   456,   847,   868,   845,   418,
+     856,   897,  1026,   887,   900,   897,   850,   891,   900,    81,
+     848,   853,   851,   897,   899,   448,   900,   897,   870,   421,
+     428,   905,   868,   453,   900,   634,   897,   902,  1032,   900,
+     866,   438,   887,   891,   624,  1049,  1066,   906,  1083,    -1,
+      -1,   590,    -1,    -1,    -1,    -1,   473,    -1,    -1,    -1,
+      -1,   476,    -1,   479,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1025,    -1,    -1,    -1,  1025,    -1,  1031,    -1,    -1,
-      -1,    -1,    -1,  1025,    -1,    -1,    -1,  1025,    -1,  1031,
-    1025,    -1,    -1,    -1,  1048,  1025,    -1,    -1,    -1,  1025,
-      -1,  1031,    -1,    -1,    -1,  1031,  1048,  1025,    -1,    -1,
-      -1,  1025,    -1,  1025,    -1,    -1,    -1,    -1,  1048,    -1,
-      -1,    -1,  1048,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1025,    -1,    -1,    -1,    -1,    -1,  1031
+      -1,    -1,  1026,    -1,    -1,    -1,  1026,    -1,  1032,    -1,
+      -1,    -1,  1032,    -1,  1026,    -1,    -1,    -1,  1026,    -1,
+      -1,    -1,    -1,    -1,  1032,  1049,    -1,    -1,    -1,  1049,
+    1026,  1026,    -1,  1026,  1026,    -1,    -1,    -1,    -1,    -1,
+    1026,  1049,    -1,    -1,  1026,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1026,    -1,    -1,    -1,    -1,    -1,  1032,    -1,
+      -1,    -1,    -1,    -1,    -1,  1026,    -1,    -1,    -1,    -1,
+      -1,  1032,    -1,    -1,    -1,  1049
   };
 
   const unsigned short
@@ -4549,103 +4553,104 @@ namespace isc { namespace dhcp {
      201,   170,   196,   197,    10,   143,   152,   153,   154,   170,
      206,   209,   210,   211,   521,   523,   525,   536,     7,    11,
       13,    16,    17,    18,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    65,    66,    77,    78,    79,    80,    81,
-      83,    88,    97,   100,   107,   115,   116,   119,   120,   206,
-     215,   216,   217,   218,   219,   220,   221,   222,   224,   233,
-     235,   237,   270,   276,   282,   288,   290,   304,   314,   339,
-     347,   373,   403,   405,   424,   454,   466,   478,   479,   487,
-     489,   527,    14,    15,   206,   228,   229,   230,   232,   403,
-     405,    57,    59,    67,    68,    69,    70,    71,    72,    84,
-      87,    95,   206,   217,   218,   219,   220,   322,   323,   324,
-     326,   328,   330,   332,   334,   337,   338,   373,   391,   403,
-     405,   407,   424,   449,    58,   206,   330,   332,   373,   399,
-     400,   401,   403,   405,    60,    61,    62,    63,    64,   206,
-     330,   332,   373,   403,   405,   415,   416,   417,   419,   420,
-     422,   423,    83,    89,    90,    91,    92,    93,    94,   206,
-     373,   403,   405,   432,   433,   434,   435,   437,   439,   441,
-     443,   445,   447,   347,    19,    48,    50,    51,    54,    55,
-      56,   206,   255,   357,   358,   359,   360,   361,   362,   363,
-     365,   367,   369,   370,   372,   403,   405,    49,    52,    53,
-     206,   255,   361,   367,   381,   382,   383,   384,   385,   387,
-     388,   389,   390,   403,   405,    98,    99,   206,   298,   299,
-     300,   302,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   141,   142,   206,   403,   405,
-     493,   494,   495,   496,   498,   500,   501,   503,   504,   505,
-     508,   510,   511,   512,   515,   517,   519,   144,   540,   541,
-     542,    12,   206,   532,   533,   534,     6,     3,     4,     8,
-       3,   212,   537,   522,   524,   526,     4,     3,     8,   528,
-     529,   225,   234,   236,   238,     4,     4,     4,     4,     4,
-     223,   315,   348,   374,   404,   406,   340,   277,   289,   283,
-     271,   455,   425,   291,   305,   467,     4,   480,   488,   490,
-       3,     8,   231,     4,     3,     8,   392,   408,   325,   327,
-     329,     4,     4,   335,   333,   331,   450,     3,     8,   402,
-       3,     8,   418,     4,   421,     4,     4,     3,     8,   448,
-     436,   438,   440,   442,   444,   446,     8,     3,     8,   364,
-     256,     4,   368,   366,   371,     4,     8,     3,   386,     4,
-       4,     8,     3,   301,   303,     3,     8,     4,   497,   499,
-       4,   502,     4,     4,   506,   509,     4,     4,   513,   516,
-     518,   520,     3,     8,   543,     3,     8,   535,     3,     8,
-     191,   191,   170,     4,     4,     4,     4,     4,   210,   532,
-       4,     4,     4,     4,     4,   171,   171,   171,   171,   171,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,   171,     4,     4,     4,
-     216,     4,   173,   229,     4,     4,     4,     4,     4,   171,
-     173,     4,     4,     4,     4,   323,     4,   400,     4,   171,
-       4,   171,   171,   416,     4,     4,     4,     4,     4,     4,
-       4,   434,     4,     4,   171,     4,     4,     4,   173,   359,
-       4,   173,   173,   383,     4,     4,   299,   173,     4,     4,
-     171,     4,   171,   171,     4,     4,   173,   173,     4,     4,
-       4,     4,   494,     4,   541,     4,   533,     4,     7,     7,
-     191,   191,   191,     8,     7,     7,     7,     7,     5,   170,
-       5,     5,     5,   193,   195,   170,     5,     5,     5,     5,
-       7,     5,     5,     5,     7,     7,     7,   195,     7,     5,
-     202,     5,     5,   170,   170,   170,    73,    74,    75,    76,
-     336,   202,   170,     7,   170,   170,   170,   202,   202,   202,
-     170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
-     170,   191,   170,   170,   170,   134,   135,   507,   136,   137,
-     138,   139,   140,   173,   514,   170,   170,   170,     5,     5,
-     191,   215,   540,   532,   228,    19,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,   206,   243,   244,   245,   248,   250,   252,   254,   255,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   267,
-     268,   243,     7,   239,   240,   241,     7,   316,   317,   318,
-       7,   351,   352,   353,     7,   375,   376,   377,     7,   341,
-     342,   343,    91,   170,   278,   279,   280,   281,   200,    92,
-      94,   280,   284,   285,   286,   287,    82,   272,   273,   274,
-       7,   456,   457,     7,   426,   427,   428,     7,   292,   293,
-     294,   101,   102,   103,   104,   105,   106,   306,   307,   308,
-     309,   310,   311,   312,   313,    19,   111,   112,   113,   114,
-     206,   257,   403,   405,   468,   469,   470,   473,   474,   476,
-     477,   117,   118,   206,   403,   405,   481,   482,   483,   485,
-     493,   203,     7,   393,   394,   395,     7,   409,   410,   411,
-      96,   435,   451,   452,     7,   544,   545,   239,     8,     8,
-       8,     8,   246,   249,   251,   253,     4,     4,     4,     4,
-       4,   266,     4,     4,   269,     4,     4,     4,     3,     8,
-       8,   242,     6,     3,   319,     6,     3,   354,     6,     3,
-     378,     6,     3,   344,     6,     3,     3,     6,     6,     3,
-       6,   275,     3,     8,   458,     3,     6,   429,     6,     3,
-     295,     6,     3,     4,     4,     4,     4,     4,     4,     3,
-       8,   471,   475,     4,     4,     4,     3,     8,   484,   486,
-       3,     8,     8,   170,   204,   205,   396,     6,     3,   412,
-       6,     3,   453,     8,   546,     3,     6,     6,     4,     4,
-       4,     4,   171,   173,   171,   173,   171,     4,   171,   171,
-       4,   171,   171,   173,   244,   243,   241,   322,   318,   357,
-     353,   381,   377,   206,   217,   218,   219,   220,   255,   314,
-     326,   328,   330,   332,   334,   338,   345,   346,   373,   403,
-     405,   449,   343,   279,   285,     4,   273,    85,    86,   206,
-     255,   373,   403,   405,   459,   460,   461,   462,   463,   465,
-     457,   432,   428,   298,   294,   171,   171,   171,   171,   171,
-     171,   307,     4,     4,   171,   171,   171,   469,     4,     4,
-     482,     6,     3,   399,   395,   415,   411,     4,   145,   147,
-     148,   206,   255,   403,   405,   547,   548,   549,   550,   552,
-     545,    20,    21,    22,    23,   247,   170,   170,   170,   170,
-     170,     8,     8,     8,     8,     3,     8,   170,   464,     4,
-       8,     3,     8,     8,   108,   109,   110,   472,   170,   170,
-     170,   170,     8,     8,   170,   553,     4,   551,     3,     8,
-     346,     4,   173,   461,     4,   171,     4,   548,   170,     5,
-     170,     7,   554,   555,   556,     3,     6,   146,   149,   150,
-     151,   557,   558,   559,   561,   562,   563,   555,   560,     4,
-       4,     4,     3,     8,     4,   173,   171,   171,   558,   170
+      45,    46,    47,    65,    66,    72,    77,    78,    79,    80,
+      81,    83,    88,    97,   100,   107,   115,   116,   119,   120,
+     206,   215,   216,   217,   218,   219,   220,   221,   222,   224,
+     233,   235,   237,   270,   276,   282,   288,   290,   304,   314,
+     334,   339,   347,   373,   403,   405,   424,   454,   466,   478,
+     479,   487,   489,   527,    14,    15,   206,   228,   229,   230,
+     232,   403,   405,    57,    59,    67,    68,    69,    70,    71,
+      84,    87,    95,   206,   217,   218,   219,   220,   322,   323,
+     324,   326,   328,   330,   332,   334,   337,   338,   373,   391,
+     403,   405,   407,   424,   449,    58,   206,   330,   332,   373,
+     399,   400,   401,   403,   405,    60,    61,    62,    63,    64,
+     206,   330,   332,   373,   403,   405,   415,   416,   417,   419,
+     420,   422,   423,    83,    89,    90,    91,    92,    93,    94,
+     206,   373,   403,   405,   432,   433,   434,   435,   437,   439,
+     441,   443,   445,   447,   347,    19,    48,    50,    51,    54,
+      55,    56,   206,   255,   357,   358,   359,   360,   361,   362,
+     363,   365,   367,   369,   370,   372,   403,   405,    49,    52,
+      53,   206,   255,   361,   367,   381,   382,   383,   384,   385,
+     387,   388,   389,   390,   403,   405,    98,    99,   206,   298,
+     299,   300,   302,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,   132,   133,   141,   142,   206,   403,
+     405,   493,   494,   495,   496,   498,   500,   501,   503,   504,
+     505,   508,   510,   511,   512,   515,   517,   519,   144,   540,
+     541,   542,    12,   206,   532,   533,   534,     6,     3,     4,
+       8,     3,   212,   537,   522,   524,   526,     4,     3,     8,
+     528,   529,   225,   234,   236,   238,     4,     4,     4,     4,
+       4,   223,   315,   348,   374,   404,   406,   335,   340,   277,
+     289,   283,   271,   455,   425,   291,   305,   467,     4,   480,
+     488,   490,     3,     8,   231,     4,     3,     8,   392,   408,
+     325,   327,   329,     4,     4,   333,   331,   450,     3,     8,
+     402,     3,     8,   418,     4,   421,     4,     4,     3,     8,
+     448,   436,   438,   440,   442,   444,   446,     8,     3,     8,
+     364,   256,     4,   368,   366,   371,     4,     8,     3,   386,
+       4,     4,     8,     3,   301,   303,     3,     8,     4,   497,
+     499,     4,   502,     4,     4,   506,   509,     4,     4,   513,
+     516,   518,   520,     3,     8,   543,     3,     8,   535,     3,
+       8,   191,   191,   170,     4,     4,     4,     4,     4,   210,
+     532,     4,     4,     4,     4,     4,   171,   171,   171,   171,
+     171,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,   171,     4,
+       4,     4,   216,     4,   173,   229,     4,     4,     4,     4,
+       4,   171,   173,     4,     4,     4,   323,     4,   400,     4,
+     171,     4,   171,   171,   416,     4,     4,     4,     4,     4,
+       4,     4,   434,     4,     4,   171,     4,     4,     4,   173,
+     359,     4,   173,   173,   383,     4,     4,   299,   173,     4,
+       4,   171,     4,   171,   171,     4,     4,   173,   173,     4,
+       4,     4,     4,   494,     4,   541,     4,   533,     4,     7,
+       7,   191,   191,   191,     8,     7,     7,     7,     7,     5,
+     170,     5,     5,     5,   193,   195,   170,    73,    74,    75,
+      76,   336,     5,     5,     5,     5,     7,     5,     5,     5,
+       7,     7,     7,   195,     7,     5,   202,     5,     5,   170,
+     170,   170,   202,   170,     7,   170,   170,   170,   202,   202,
+     202,   170,   170,   170,   170,   170,   170,   170,   170,   170,
+     170,   170,   191,   170,   170,   170,   134,   135,   507,   136,
+     137,   138,   139,   140,   173,   514,   170,   170,   170,     5,
+       5,   191,   215,   540,   532,   228,    19,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,   206,   243,   244,   245,   248,   250,   252,   254,
+     255,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+     267,   268,   243,     7,   239,   240,   241,     7,   316,   317,
+     318,     7,   351,   352,   353,     7,   375,   376,   377,     7,
+     341,   342,   343,    91,   170,   278,   279,   280,   281,   200,
+      92,    94,   280,   284,   285,   286,   287,    82,   272,   273,
+     274,     7,   456,   457,     7,   426,   427,   428,     7,   292,
+     293,   294,   101,   102,   103,   104,   105,   106,   306,   307,
+     308,   309,   310,   311,   312,   313,    19,   111,   112,   113,
+     114,   206,   257,   403,   405,   468,   469,   470,   473,   474,
+     476,   477,   117,   118,   206,   403,   405,   481,   482,   483,
+     485,   493,   203,     7,   393,   394,   395,     7,   409,   410,
+     411,    96,   435,   451,   452,     7,   544,   545,   239,     8,
+       8,     8,     8,   246,   249,   251,   253,     4,     4,     4,
+       4,     4,   266,     4,     4,   269,     4,     4,     4,     3,
+       8,     8,   242,     6,     3,   319,     6,     3,   354,     6,
+       3,   378,     6,     3,   344,     6,     3,     3,     6,     6,
+       3,     6,   275,     3,     8,   458,     3,     6,   429,     6,
+       3,   295,     6,     3,     4,     4,     4,     4,     4,     4,
+       3,     8,   471,   475,     4,     4,     4,     3,     8,   484,
+     486,     3,     8,     8,   170,   204,   205,   396,     6,     3,
+     412,     6,     3,   453,     8,   546,     3,     6,     6,     4,
+       4,     4,     4,   171,   173,   171,   173,   171,     4,   171,
+     171,     4,   171,   171,   173,   244,   243,   241,   322,   318,
+     357,   353,   381,   377,   206,   217,   218,   219,   220,   255,
+     314,   326,   328,   330,   332,   334,   338,   345,   346,   373,
+     403,   405,   449,   343,   279,   285,     4,   273,    85,    86,
+     206,   255,   373,   403,   405,   459,   460,   461,   462,   463,
+     465,   457,   432,   428,   298,   294,   171,   171,   171,   171,
+     171,   171,   307,     4,     4,   171,   171,   171,   469,     4,
+       4,   482,     6,     3,   399,   395,   415,   411,     4,   145,
+     147,   148,   206,   255,   403,   405,   547,   548,   549,   550,
+     552,   545,    20,    21,    22,    23,   247,   170,   170,   170,
+     170,   170,     8,     8,     8,     8,     3,     8,   170,   464,
+       4,     8,     3,     8,     8,   108,   109,   110,   472,   170,
+     170,   170,   170,     8,     8,   170,   553,     4,   551,     3,
+       8,   346,     4,   173,   461,     4,   171,     4,   548,   170,
+       5,   170,     7,   554,   555,   556,     3,     6,   146,   149,
+     150,   151,   557,   558,   559,   561,   562,   563,   555,   560,
+       4,     4,     4,     3,     8,     4,   173,   171,   171,   558,
+     170
   };
 
   const unsigned short
@@ -4661,63 +4666,64 @@ namespace isc { namespace dhcp {
      212,   211,   214,   213,   215,   215,   216,   216,   216,   216,
      216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
      216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   217,   218,   219,
-     220,   221,   223,   222,   225,   224,   227,   226,   228,   228,
-     229,   229,   229,   229,   229,   231,   230,   232,   234,   233,
-     236,   235,   238,   237,   239,   239,   240,   240,   242,   241,
-     243,   243,   244,   244,   244,   244,   244,   244,   244,   244,
+     216,   216,   216,   216,   216,   216,   216,   216,   217,   218,
+     219,   220,   221,   223,   222,   225,   224,   227,   226,   228,
+     228,   229,   229,   229,   229,   229,   231,   230,   232,   234,
+     233,   236,   235,   238,   237,   239,   239,   240,   240,   242,
+     241,   243,   243,   244,   244,   244,   244,   244,   244,   244,
      244,   244,   244,   244,   244,   244,   244,   244,   244,   244,
-     246,   245,   247,   247,   247,   247,   249,   248,   251,   250,
-     253,   252,   254,   256,   255,   257,   258,   259,   260,   261,
-     262,   263,   264,   266,   265,   267,   269,   268,   271,   270,
-     272,   272,   273,   275,   274,   277,   276,   278,   278,   279,
-     279,   280,   281,   283,   282,   284,   284,   285,   285,   285,
-     286,   287,   289,   288,   291,   290,   292,   292,   293,   293,
-     295,   294,   297,   296,   298,   298,   298,   299,   299,   301,
-     300,   303,   302,   305,   304,   306,   306,   307,   307,   307,
-     307,   307,   307,   308,   309,   310,   311,   312,   313,   315,
-     314,   316,   316,   317,   317,   319,   318,   321,   320,   322,
-     322,   323,   323,   323,   323,   323,   323,   323,   323,   323,
+     244,   246,   245,   247,   247,   247,   247,   249,   248,   251,
+     250,   253,   252,   254,   256,   255,   257,   258,   259,   260,
+     261,   262,   263,   264,   266,   265,   267,   269,   268,   271,
+     270,   272,   272,   273,   275,   274,   277,   276,   278,   278,
+     279,   279,   280,   281,   283,   282,   284,   284,   285,   285,
+     285,   286,   287,   289,   288,   291,   290,   292,   292,   293,
+     293,   295,   294,   297,   296,   298,   298,   298,   299,   299,
+     301,   300,   303,   302,   305,   304,   306,   306,   307,   307,
+     307,   307,   307,   307,   308,   309,   310,   311,   312,   313,
+     315,   314,   316,   316,   317,   317,   319,   318,   321,   320,
+     322,   322,   323,   323,   323,   323,   323,   323,   323,   323,
      323,   323,   323,   323,   323,   323,   323,   323,   323,   323,
-     323,   325,   324,   327,   326,   329,   328,   331,   330,   333,
-     332,   335,   334,   336,   336,   336,   336,   337,   338,   340,
-     339,   341,   341,   342,   342,   344,   343,   345,   345,   346,
+     323,   323,   325,   324,   327,   326,   329,   328,   331,   330,
+     333,   332,   335,   334,   336,   336,   336,   336,   337,   338,
+     340,   339,   341,   341,   342,   342,   344,   343,   345,   345,
      346,   346,   346,   346,   346,   346,   346,   346,   346,   346,
-     346,   346,   346,   346,   346,   346,   348,   347,   350,   349,
-     351,   351,   352,   352,   354,   353,   356,   355,   357,   357,
-     358,   358,   359,   359,   359,   359,   359,   359,   359,   359,
-     359,   359,   360,   361,   362,   364,   363,   366,   365,   368,
-     367,   369,   371,   370,   372,   374,   373,   375,   375,   376,
-     376,   378,   377,   380,   379,   381,   381,   382,   382,   383,
-     383,   383,   383,   383,   383,   383,   383,   383,   384,   386,
-     385,   387,   388,   389,   390,   392,   391,   393,   393,   394,
-     394,   396,   395,   398,   397,   399,   399,   400,   400,   400,
-     400,   400,   400,   400,   402,   401,   404,   403,   406,   405,
-     408,   407,   409,   409,   410,   410,   412,   411,   414,   413,
-     415,   415,   416,   416,   416,   416,   416,   416,   416,   416,
-     416,   416,   416,   418,   417,   419,   421,   420,   422,   423,
-     425,   424,   426,   426,   427,   427,   429,   428,   431,   430,
-     432,   432,   433,   433,   434,   434,   434,   434,   434,   434,
-     434,   434,   434,   434,   434,   436,   435,   438,   437,   440,
-     439,   442,   441,   444,   443,   446,   445,   448,   447,   450,
-     449,   451,   451,   453,   452,   455,   454,   456,   456,   458,
-     457,   459,   459,   460,   460,   461,   461,   461,   461,   461,
-     461,   461,   462,   464,   463,   465,   467,   466,   468,   468,
-     469,   469,   469,   469,   469,   469,   469,   469,   469,   471,
-     470,   472,   472,   472,   473,   475,   474,   476,   477,   478,
-     480,   479,   481,   481,   482,   482,   482,   482,   482,   484,
-     483,   486,   485,   488,   487,   490,   489,   492,   491,   493,
-     493,   494,   494,   494,   494,   494,   494,   494,   494,   494,
-     494,   494,   494,   494,   494,   494,   494,   494,   494,   495,
-     497,   496,   499,   498,   500,   502,   501,   503,   504,   506,
-     505,   507,   507,   509,   508,   510,   511,   513,   512,   514,
-     514,   514,   514,   514,   516,   515,   518,   517,   520,   519,
-     522,   521,   524,   523,   526,   525,   528,   527,   529,   527,
-     531,   530,   532,   532,   533,   533,   535,   534,   537,   536,
-     539,   538,   540,   540,   541,   543,   542,   544,   544,   546,
-     545,   547,   547,   548,   548,   548,   548,   548,   548,   548,
-     549,   551,   550,   553,   552,   554,   554,   556,   555,   557,
-     557,   558,   558,   558,   558,   560,   559,   561,   562,   563
+     346,   346,   346,   346,   346,   346,   346,   348,   347,   350,
+     349,   351,   351,   352,   352,   354,   353,   356,   355,   357,
+     357,   358,   358,   359,   359,   359,   359,   359,   359,   359,
+     359,   359,   359,   360,   361,   362,   364,   363,   366,   365,
+     368,   367,   369,   371,   370,   372,   374,   373,   375,   375,
+     376,   376,   378,   377,   380,   379,   381,   381,   382,   382,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   384,
+     386,   385,   387,   388,   389,   390,   392,   391,   393,   393,
+     394,   394,   396,   395,   398,   397,   399,   399,   400,   400,
+     400,   400,   400,   400,   400,   402,   401,   404,   403,   406,
+     405,   408,   407,   409,   409,   410,   410,   412,   411,   414,
+     413,   415,   415,   416,   416,   416,   416,   416,   416,   416,
+     416,   416,   416,   416,   418,   417,   419,   421,   420,   422,
+     423,   425,   424,   426,   426,   427,   427,   429,   428,   431,
+     430,   432,   432,   433,   433,   434,   434,   434,   434,   434,
+     434,   434,   434,   434,   434,   434,   436,   435,   438,   437,
+     440,   439,   442,   441,   444,   443,   446,   445,   448,   447,
+     450,   449,   451,   451,   453,   452,   455,   454,   456,   456,
+     458,   457,   459,   459,   460,   460,   461,   461,   461,   461,
+     461,   461,   461,   462,   464,   463,   465,   467,   466,   468,
+     468,   469,   469,   469,   469,   469,   469,   469,   469,   469,
+     471,   470,   472,   472,   472,   473,   475,   474,   476,   477,
+     478,   480,   479,   481,   481,   482,   482,   482,   482,   482,
+     484,   483,   486,   485,   488,   487,   490,   489,   492,   491,
+     493,   493,   494,   494,   494,   494,   494,   494,   494,   494,
+     494,   494,   494,   494,   494,   494,   494,   494,   494,   494,
+     495,   497,   496,   499,   498,   500,   502,   501,   503,   504,
+     506,   505,   507,   507,   509,   508,   510,   511,   513,   512,
+     514,   514,   514,   514,   514,   516,   515,   518,   517,   520,
+     519,   522,   521,   524,   523,   526,   525,   528,   527,   529,
+     527,   531,   530,   532,   532,   533,   533,   535,   534,   537,
+     536,   539,   538,   540,   540,   541,   543,   542,   544,   544,
+     546,   545,   547,   547,   548,   548,   548,   548,   548,   548,
+     548,   549,   551,   550,   553,   552,   554,   554,   556,   555,
+     557,   557,   558,   558,   558,   558,   560,   559,   561,   562,
+     563
   };
 
   const unsigned char
@@ -4733,63 +4739,64 @@ namespace isc { namespace dhcp {
        0,     6,     0,     4,     1,     3,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     3,     3,     3,
-       3,     3,     0,     4,     0,     6,     0,     4,     1,     3,
-       1,     1,     1,     1,     1,     0,     4,     3,     0,     6,
-       0,     6,     0,     6,     0,     1,     1,     3,     0,     4,
-       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     4,     1,     1,     1,     1,     0,     4,     0,     4,
-       0,     4,     3,     0,     4,     3,     3,     3,     3,     3,
-       3,     3,     3,     0,     4,     3,     0,     4,     0,     6,
-       1,     3,     1,     0,     4,     0,     6,     1,     3,     1,
-       1,     1,     1,     0,     6,     1,     3,     1,     1,     1,
-       1,     1,     0,     6,     0,     6,     0,     1,     1,     3,
-       0,     4,     0,     4,     1,     3,     1,     1,     1,     0,
-       4,     0,     4,     0,     6,     1,     3,     1,     1,     1,
-       1,     1,     1,     3,     3,     3,     3,     3,     3,     0,
-       6,     0,     1,     1,     3,     0,     4,     0,     4,     1,
-       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     0,     4,     0,     4,     0,     4,     0,     4,     0,
-       4,     0,     4,     1,     1,     1,     1,     3,     3,     0,
-       6,     0,     1,     1,     3,     0,     4,     1,     3,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     3,
+       3,     3,     3,     0,     4,     0,     6,     0,     4,     1,
+       3,     1,     1,     1,     1,     1,     0,     4,     3,     0,
+       6,     0,     6,     0,     6,     0,     1,     1,     3,     0,
+       4,     1,     3,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     0,     6,     0,     4,
-       0,     1,     1,     3,     0,     4,     0,     4,     0,     1,
-       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     3,     1,     0,     4,     0,     4,     0,
-       4,     1,     0,     4,     3,     0,     6,     0,     1,     1,
-       3,     0,     4,     0,     4,     0,     1,     1,     3,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       4,     1,     1,     3,     3,     0,     6,     0,     1,     1,
+       1,     0,     4,     1,     1,     1,     1,     0,     4,     0,
+       4,     0,     4,     3,     0,     4,     3,     3,     3,     3,
+       3,     3,     3,     3,     0,     4,     3,     0,     4,     0,
+       6,     1,     3,     1,     0,     4,     0,     6,     1,     3,
+       1,     1,     1,     1,     0,     6,     1,     3,     1,     1,
+       1,     1,     1,     0,     6,     0,     6,     0,     1,     1,
        3,     0,     4,     0,     4,     1,     3,     1,     1,     1,
-       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
+       0,     4,     0,     4,     0,     6,     1,     3,     1,     1,
+       1,     1,     1,     1,     3,     3,     3,     3,     3,     3,
        0,     6,     0,     1,     1,     3,     0,     4,     0,     4,
        1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     4,     3,     0,     4,     3,     3,
-       0,     6,     0,     1,     1,     3,     0,     4,     0,     4,
-       0,     1,     1,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     0,     4,     0,     4,     0,     4,     0,     4,
+       0,     4,     0,     4,     1,     1,     1,     1,     3,     3,
+       0,     6,     0,     1,     1,     3,     0,     4,     1,     3,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     6,     0,
+       4,     0,     1,     1,     3,     0,     4,     0,     4,     0,
+       1,     1,     3,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     3,     1,     0,     4,     0,     4,
+       0,     4,     1,     0,     4,     3,     0,     6,     0,     1,
+       1,     3,     0,     4,     0,     4,     0,     1,     1,     3,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       0,     4,     1,     1,     3,     3,     0,     6,     0,     1,
+       1,     3,     0,     4,     0,     4,     1,     3,     1,     1,
        1,     1,     1,     1,     1,     0,     4,     0,     4,     0,
-       4,     0,     4,     0,     4,     0,     4,     0,     4,     0,
-       6,     1,     1,     0,     4,     0,     6,     1,     3,     0,
+       4,     0,     6,     0,     1,     1,     3,     0,     4,     0,
+       4,     1,     3,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     4,     3,     0,     4,     3,
+       3,     0,     6,     0,     1,     1,     3,     0,     4,     0,
        4,     0,     1,     1,     3,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     4,     3,     0,     6,     1,     3,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       4,     1,     1,     1,     3,     0,     4,     3,     3,     3,
-       0,     6,     1,     3,     1,     1,     1,     1,     1,     0,
-       4,     0,     4,     0,     4,     0,     6,     0,     4,     1,
+       1,     1,     1,     1,     1,     1,     0,     4,     0,     4,
+       0,     4,     0,     4,     0,     4,     0,     4,     0,     4,
+       0,     6,     1,     1,     0,     4,     0,     6,     1,     3,
+       0,     4,     0,     1,     1,     3,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     4,     3,     0,     6,     1,
        3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
-       0,     4,     0,     4,     3,     0,     4,     3,     3,     0,
-       4,     1,     1,     0,     4,     3,     3,     0,     4,     1,
-       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
-       0,     4,     0,     4,     0,     4,     0,     4,     0,     6,
-       0,     4,     1,     3,     1,     1,     0,     6,     0,     6,
-       0,     4,     1,     3,     1,     0,     6,     1,     3,     0,
-       4,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       3,     0,     4,     0,     6,     1,     3,     0,     4,     1,
-       3,     1,     1,     1,     1,     0,     4,     3,     3,     3
+       0,     4,     1,     1,     1,     3,     0,     4,     3,     3,
+       3,     0,     6,     1,     3,     1,     1,     1,     1,     1,
+       0,     4,     0,     4,     0,     4,     0,     6,     0,     4,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       3,     0,     4,     0,     4,     3,     0,     4,     3,     3,
+       0,     4,     1,     1,     0,     4,     3,     3,     0,     4,
+       1,     1,     1,     1,     1,     0,     4,     0,     4,     0,
+       4,     0,     4,     0,     4,     0,     4,     0,     4,     0,
+       6,     0,     4,     1,     3,     1,     1,     0,     6,     0,
+       6,     0,     4,     1,     3,     1,     0,     6,     1,     3,
+       0,     4,     1,     3,     1,     1,     1,     1,     1,     1,
+       1,     3,     0,     4,     0,     6,     1,     3,     0,     4,
+       1,     3,     1,     1,     1,     1,     0,     4,     3,     3,
+       3
   };
 
 
@@ -4956,63 +4963,64 @@ namespace isc { namespace dhcp {
      408,   408,   423,   423,   432,   433,   438,   439,   440,   441,
      442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
      452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,   464,   465,   466,   467,   468,   471,   476,   481,
-     486,   491,   496,   496,   504,   504,   515,   515,   524,   525,
-     528,   529,   530,   531,   532,   535,   535,   545,   551,   551,
-     563,   563,   575,   575,   585,   586,   589,   590,   593,   593,
-     603,   604,   607,   608,   609,   610,   611,   612,   613,   614,
+     462,   463,   464,   465,   466,   467,   468,   469,   472,   477,
+     482,   487,   492,   497,   497,   505,   505,   516,   516,   525,
+     526,   529,   530,   531,   532,   533,   536,   536,   546,   552,
+     552,   564,   564,   576,   576,   586,   587,   590,   591,   594,
+     594,   604,   605,   608,   609,   610,   611,   612,   613,   614,
      615,   616,   617,   618,   619,   620,   621,   622,   623,   624,
-     627,   627,   634,   635,   636,   637,   640,   640,   648,   648,
-     656,   656,   664,   669,   669,   677,   682,   687,   692,   697,
-     702,   707,   712,   717,   717,   725,   730,   730,   738,   738,
-     748,   749,   751,   753,   753,   771,   771,   781,   782,   785,
-     786,   789,   794,   799,   799,   809,   810,   813,   814,   815,
-     818,   823,   830,   830,   840,   840,   850,   851,   854,   855,
-     858,   858,   868,   868,   878,   879,   880,   883,   884,   887,
-     887,   895,   895,   903,   903,   914,   915,   918,   919,   920,
-     921,   922,   923,   926,   931,   936,   941,   946,   951,   959,
-     959,   972,   973,   976,   977,   984,   984,  1010,  1010,  1021,
-    1022,  1026,  1027,  1028,  1029,  1030,  1031,  1032,  1033,  1034,
+     625,   628,   628,   635,   636,   637,   638,   641,   641,   649,
+     649,   657,   657,   665,   670,   670,   678,   683,   688,   693,
+     698,   703,   708,   713,   718,   718,   726,   731,   731,   739,
+     739,   749,   750,   752,   754,   754,   772,   772,   782,   783,
+     786,   787,   790,   795,   800,   800,   810,   811,   814,   815,
+     816,   819,   824,   831,   831,   841,   841,   851,   852,   855,
+     856,   859,   859,   869,   869,   879,   880,   881,   884,   885,
+     888,   888,   896,   896,   904,   904,   915,   916,   919,   920,
+     921,   922,   923,   924,   927,   932,   937,   942,   947,   952,
+     960,   960,   973,   974,   977,   978,   985,   985,  1011,  1011,
+    1022,  1023,  1027,  1028,  1029,  1030,  1031,  1032,  1033,  1034,
     1035,  1036,  1037,  1038,  1039,  1040,  1041,  1042,  1043,  1044,
-    1045,  1048,  1048,  1056,  1056,  1064,  1064,  1072,  1072,  1080,
-    1080,  1090,  1090,  1097,  1098,  1099,  1100,  1103,  1108,  1116,
-    1116,  1127,  1128,  1132,  1133,  1136,  1136,  1144,  1145,  1148,
+    1045,  1046,  1049,  1049,  1057,  1057,  1065,  1065,  1073,  1073,
+    1081,  1081,  1091,  1091,  1098,  1099,  1100,  1101,  1104,  1109,
+    1117,  1117,  1128,  1129,  1133,  1134,  1137,  1137,  1145,  1146,
     1149,  1150,  1151,  1152,  1153,  1154,  1155,  1156,  1157,  1158,
-    1159,  1160,  1161,  1162,  1163,  1164,  1171,  1171,  1184,  1184,
-    1193,  1194,  1197,  1198,  1203,  1203,  1218,  1218,  1232,  1233,
-    1236,  1237,  1240,  1241,  1242,  1243,  1244,  1245,  1246,  1247,
-    1248,  1249,  1252,  1254,  1259,  1261,  1261,  1269,  1269,  1277,
-    1277,  1285,  1287,  1287,  1295,  1304,  1304,  1316,  1317,  1322,
-    1323,  1328,  1328,  1340,  1340,  1352,  1353,  1358,  1359,  1364,
-    1365,  1366,  1367,  1368,  1369,  1370,  1371,  1372,  1375,  1377,
-    1377,  1385,  1387,  1389,  1394,  1402,  1402,  1414,  1415,  1418,
-    1419,  1422,  1422,  1432,  1432,  1441,  1442,  1445,  1446,  1447,
-    1448,  1449,  1450,  1451,  1454,  1454,  1462,  1462,  1487,  1487,
-    1517,  1517,  1529,  1530,  1533,  1534,  1537,  1537,  1549,  1549,
-    1561,  1562,  1565,  1566,  1567,  1568,  1569,  1570,  1571,  1572,
-    1573,  1574,  1575,  1578,  1578,  1586,  1591,  1591,  1599,  1604,
-    1612,  1612,  1622,  1623,  1626,  1627,  1630,  1630,  1639,  1639,
-    1648,  1649,  1652,  1653,  1657,  1658,  1659,  1660,  1661,  1662,
-    1663,  1664,  1665,  1666,  1667,  1670,  1670,  1680,  1680,  1690,
-    1690,  1698,  1698,  1706,  1706,  1714,  1714,  1722,  1722,  1735,
-    1735,  1745,  1746,  1749,  1749,  1760,  1760,  1770,  1771,  1774,
-    1774,  1784,  1785,  1788,  1789,  1792,  1793,  1794,  1795,  1796,
-    1797,  1798,  1801,  1803,  1803,  1811,  1819,  1819,  1831,  1832,
-    1835,  1836,  1837,  1838,  1839,  1840,  1841,  1842,  1843,  1846,
-    1846,  1853,  1854,  1855,  1858,  1863,  1863,  1871,  1876,  1883,
-    1890,  1890,  1900,  1901,  1904,  1905,  1906,  1907,  1908,  1911,
-    1911,  1919,  1919,  1929,  1929,  1947,  1947,  1959,  1959,  1969,
-    1970,  1973,  1974,  1975,  1976,  1977,  1978,  1979,  1980,  1981,
-    1982,  1983,  1984,  1985,  1986,  1987,  1988,  1989,  1990,  1993,
-    1998,  1998,  2006,  2006,  2014,  2019,  2019,  2027,  2032,  2037,
-    2037,  2045,  2046,  2049,  2049,  2057,  2062,  2067,  2067,  2075,
-    2078,  2081,  2084,  2087,  2093,  2093,  2101,  2101,  2109,  2109,
-    2119,  2119,  2126,  2126,  2133,  2133,  2142,  2142,  2151,  2151,
-    2162,  2162,  2172,  2173,  2177,  2178,  2181,  2181,  2196,  2196,
-    2206,  2206,  2217,  2218,  2222,  2226,  2226,  2238,  2239,  2243,
-    2243,  2251,  2252,  2255,  2256,  2257,  2258,  2259,  2260,  2261,
-    2264,  2269,  2269,  2277,  2277,  2287,  2288,  2291,  2291,  2299,
-    2300,  2303,  2304,  2305,  2306,  2309,  2309,  2317,  2322,  2327
+    1159,  1160,  1161,  1162,  1163,  1164,  1165,  1172,  1172,  1185,
+    1185,  1194,  1195,  1198,  1199,  1204,  1204,  1219,  1219,  1233,
+    1234,  1237,  1238,  1241,  1242,  1243,  1244,  1245,  1246,  1247,
+    1248,  1249,  1250,  1253,  1255,  1260,  1262,  1262,  1270,  1270,
+    1278,  1278,  1286,  1288,  1288,  1296,  1305,  1305,  1317,  1318,
+    1323,  1324,  1329,  1329,  1341,  1341,  1353,  1354,  1359,  1360,
+    1365,  1366,  1367,  1368,  1369,  1370,  1371,  1372,  1373,  1376,
+    1378,  1378,  1386,  1388,  1390,  1395,  1403,  1403,  1415,  1416,
+    1419,  1420,  1423,  1423,  1433,  1433,  1442,  1443,  1446,  1447,
+    1448,  1449,  1450,  1451,  1452,  1455,  1455,  1463,  1463,  1488,
+    1488,  1518,  1518,  1530,  1531,  1534,  1535,  1538,  1538,  1550,
+    1550,  1562,  1563,  1566,  1567,  1568,  1569,  1570,  1571,  1572,
+    1573,  1574,  1575,  1576,  1579,  1579,  1587,  1592,  1592,  1600,
+    1605,  1613,  1613,  1623,  1624,  1627,  1628,  1631,  1631,  1640,
+    1640,  1649,  1650,  1653,  1654,  1658,  1659,  1660,  1661,  1662,
+    1663,  1664,  1665,  1666,  1667,  1668,  1671,  1671,  1681,  1681,
+    1691,  1691,  1699,  1699,  1707,  1707,  1715,  1715,  1723,  1723,
+    1736,  1736,  1746,  1747,  1750,  1750,  1761,  1761,  1771,  1772,
+    1775,  1775,  1785,  1786,  1789,  1790,  1793,  1794,  1795,  1796,
+    1797,  1798,  1799,  1802,  1804,  1804,  1812,  1820,  1820,  1832,
+    1833,  1836,  1837,  1838,  1839,  1840,  1841,  1842,  1843,  1844,
+    1847,  1847,  1854,  1855,  1856,  1859,  1864,  1864,  1872,  1877,
+    1884,  1891,  1891,  1901,  1902,  1905,  1906,  1907,  1908,  1909,
+    1912,  1912,  1920,  1920,  1930,  1930,  1948,  1948,  1960,  1960,
+    1970,  1971,  1974,  1975,  1976,  1977,  1978,  1979,  1980,  1981,
+    1982,  1983,  1984,  1985,  1986,  1987,  1988,  1989,  1990,  1991,
+    1994,  1999,  1999,  2007,  2007,  2015,  2020,  2020,  2028,  2033,
+    2038,  2038,  2046,  2047,  2050,  2050,  2058,  2063,  2068,  2068,
+    2076,  2079,  2082,  2085,  2088,  2094,  2094,  2102,  2102,  2110,
+    2110,  2120,  2120,  2127,  2127,  2134,  2134,  2143,  2143,  2152,
+    2152,  2163,  2163,  2173,  2174,  2178,  2179,  2182,  2182,  2197,
+    2197,  2207,  2207,  2218,  2219,  2223,  2227,  2227,  2239,  2240,
+    2244,  2244,  2252,  2253,  2256,  2257,  2258,  2259,  2260,  2261,
+    2262,  2265,  2270,  2270,  2278,  2278,  2288,  2289,  2292,  2292,
+    2300,  2301,  2304,  2305,  2306,  2307,  2310,  2310,  2318,  2323,
+    2328
   };
 
   // Print the state stack on the debug stream.
@@ -5047,8 +5055,8 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp6_parser.yy" // lalr1.cc:1218
 } } // isc::dhcp
-#line 5051 "dhcp6_parser.cc" // lalr1.cc:1218
-#line 2332 "dhcp6_parser.yy" // lalr1.cc:1219
+#line 5059 "dhcp6_parser.cc" // lalr1.cc:1218
+#line 2333 "dhcp6_parser.yy" // lalr1.cc:1219
 
 
 void
diff --git a/src/bin/dhcp6/dhcp6_parser.h b/src/bin/dhcp6/dhcp6_parser.h
index d5a00e0d0c..c45bf9c8fe 100644
--- a/src/bin/dhcp6/dhcp6_parser.h
+++ b/src/bin/dhcp6/dhcp6_parser.h
@@ -1717,7 +1717,7 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 1019,     ///< Last index in yytable_.
+      yylast_ = 1025,     ///< Last index in yytable_.
       yynnts_ = 390,  ///< Number of nonterminal symbols.
       yyfinal_ = 32, ///< Termination state number.
       yyterror_ = 1,
diff --git a/src/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh
index fa9453482d..4c68d17ec7 100644
--- a/src/bin/dhcp6/location.hh
+++ b/src/bin/dhcp6/location.hh
@@ -1,4 +1,4 @@
-// Generated 201811201350
+// Generated 201811201411
 // A Bison parser, made by GNU Bison 3.2.1.
 
 // Locations for Bison parsers in C++
diff --git a/src/bin/dhcp6/position.hh b/src/bin/dhcp6/position.hh
index 3d9dbf9cde..4a9a456ce0 100644
--- a/src/bin/dhcp6/position.hh
+++ b/src/bin/dhcp6/position.hh
@@ -1,4 +1,4 @@
-// Generated 201811201350
+// Generated 201811201411
 // A Bison parser, made by GNU Bison 3.2.1.
 
 // Starting with Bison 3.2, this file is useless: the structure it
diff --git a/src/bin/dhcp6/stack.hh b/src/bin/dhcp6/stack.hh
index 0575d1aa94..8d96cdf2b7 100644
--- a/src/bin/dhcp6/stack.hh
+++ b/src/bin/dhcp6/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201811201350
+// Generated 201811201411
 // A Bison parser, made by GNU Bison 3.2.1.
 
 // Starting with Bison 3.2, this file is useless: the structure it