From: Francis Dupont <fdupont@isc.org>
Date: Tue, 18 Jun 2019 19:18:53 +0000 (+0000)
Subject: [#295,!345] regen flex/bison
X-Git-Tag: Kea-1.6.0-beta2~237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a441cbb8dcee4b3f7d7ca5e3bb0bb8f3c02e73f4;p=thirdparty%2Fkea.git

[#295,!345] regen flex/bison
---

diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
index 80abaddcfe..11322638e5 100644
--- a/src/bin/dhcp4/dhcp4_lexer.cc
+++ b/src/bin/dhcp4/dhcp4_lexer.cc
@@ -1764,11 +1764,11 @@ static const flex_int16_t yy_rule_linenum[183] =
      1190, 1200, 1209, 1219, 1228, 1237, 1246, 1255, 1264, 1273,
      1282, 1291, 1300, 1309, 1318, 1327, 1336, 1345, 1354, 1363,
      1372, 1381, 1390, 1399, 1408, 1417, 1426, 1435, 1444, 1453,
-     1462, 1471, 1480, 1489, 1499, 1509, 1519, 1529, 1539, 1549,
-     1559, 1569, 1579, 1588, 1597, 1606, 1615, 1624, 1633, 1642,
-     1653, 1664, 1677, 1690, 1705, 1804, 1809, 1814, 1819, 1820,
-     1821, 1822, 1823, 1824, 1826, 1844, 1857, 1862, 1866, 1868,
-     1870, 1872
+     1462, 1471, 1481, 1491, 1501, 1511, 1521, 1531, 1541, 1551,
+     1561, 1571, 1581, 1590, 1599, 1608, 1617, 1626, 1635, 1644,
+     1655, 1666, 1679, 1692, 1707, 1806, 1811, 1816, 1821, 1822,
+     1823, 1824, 1825, 1826, 1828, 1846, 1859, 1864, 1868, 1870,
+     1872, 1874
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -4015,6 +4015,7 @@ YY_RULE_SETUP
 #line 1471 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
+    case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::DHCP_DDNS:
         return isc::dhcp::Dhcp4Parser::make_HOSTNAME_CHAR_SET(driver.loc_);
     default:
@@ -4024,9 +4025,10 @@ YY_RULE_SETUP
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 1480 "dhcp4_lexer.ll"
+#line 1481 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
+    case isc::dhcp::Parser4Context::DHCP4:
     case isc::dhcp::Parser4Context::DHCP_DDNS:
         return isc::dhcp::Dhcp4Parser::make_HOSTNAME_CHAR_REPLACEMENT(driver.loc_);
     default:
@@ -4036,7 +4038,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 1489 "dhcp4_lexer.ll"
+#line 1491 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) {
@@ -4049,7 +4051,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 1499 "dhcp4_lexer.ll"
+#line 1501 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) {
@@ -4062,7 +4064,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 1509 "dhcp4_lexer.ll"
+#line 1511 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_FORMAT) {
@@ -4075,7 +4077,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 1519 "dhcp4_lexer.ll"
+#line 1521 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -4088,7 +4090,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 1529 "dhcp4_lexer.ll"
+#line 1531 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -4101,7 +4103,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 1539 "dhcp4_lexer.ll"
+#line 1541 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -4114,7 +4116,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 1549 "dhcp4_lexer.ll"
+#line 1551 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -4127,7 +4129,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 1559 "dhcp4_lexer.ll"
+#line 1561 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -4140,7 +4142,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 1569 "dhcp4_lexer.ll"
+#line 1571 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -4153,7 +4155,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 1579 "dhcp4_lexer.ll"
+#line 1581 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -4165,7 +4167,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 1588 "dhcp4_lexer.ll"
+#line 1590 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -4177,7 +4179,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 1597 "dhcp4_lexer.ll"
+#line 1599 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -4189,7 +4191,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 1606 "dhcp4_lexer.ll"
+#line 1608 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -4201,7 +4203,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 1615 "dhcp4_lexer.ll"
+#line 1617 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -4213,7 +4215,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 1624 "dhcp4_lexer.ll"
+#line 1626 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -4225,7 +4227,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 1633 "dhcp4_lexer.ll"
+#line 1635 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4237,7 +4239,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 1642 "dhcp4_lexer.ll"
+#line 1644 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4251,7 +4253,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 1653 "dhcp4_lexer.ll"
+#line 1655 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4265,7 +4267,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 1664 "dhcp4_lexer.ll"
+#line 1666 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4281,7 +4283,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 1677 "dhcp4_lexer.ll"
+#line 1679 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4297,7 +4299,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 1690 "dhcp4_lexer.ll"
+#line 1692 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4313,7 +4315,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 1705 "dhcp4_lexer.ll"
+#line 1707 "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.
@@ -4416,7 +4418,7 @@ YY_RULE_SETUP
 case 166:
 /* rule 166 can match eol */
 YY_RULE_SETUP
-#line 1804 "dhcp4_lexer.ll"
+#line 1806 "dhcp4_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
@@ -4425,7 +4427,7 @@ YY_RULE_SETUP
 case 167:
 /* rule 167 can match eol */
 YY_RULE_SETUP
-#line 1809 "dhcp4_lexer.ll"
+#line 1811 "dhcp4_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
@@ -4433,7 +4435,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 1814 "dhcp4_lexer.ll"
+#line 1816 "dhcp4_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
@@ -4441,37 +4443,37 @@ YY_RULE_SETUP
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 1819 "dhcp4_lexer.ll"
+#line 1821 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 1820 "dhcp4_lexer.ll"
+#line 1822 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 1821 "dhcp4_lexer.ll"
+#line 1823 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 1822 "dhcp4_lexer.ll"
+#line 1824 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 1823 "dhcp4_lexer.ll"
+#line 1825 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 1824 "dhcp4_lexer.ll"
+#line 1826 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 1826 "dhcp4_lexer.ll"
+#line 1828 "dhcp4_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -4492,7 +4494,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 1844 "dhcp4_lexer.ll"
+#line 1846 "dhcp4_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -4508,7 +4510,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 1857 "dhcp4_lexer.ll"
+#line 1859 "dhcp4_lexer.ll"
 {
     string tmp(yytext);
     return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -4516,33 +4518,33 @@ YY_RULE_SETUP
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 1862 "dhcp4_lexer.ll"
+#line 1864 "dhcp4_lexer.ll"
 {
    return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_);
 }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
-#line 1866 "dhcp4_lexer.ll"
+#line 1868 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
-#line 1868 "dhcp4_lexer.ll"
+#line 1870 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
-#line 1870 "dhcp4_lexer.ll"
+#line 1872 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
-#line 1872 "dhcp4_lexer.ll"
+#line 1874 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1874 "dhcp4_lexer.ll"
+#line 1876 "dhcp4_lexer.ll"
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp4Parser::make_END(driver.loc_);
@@ -4568,10 +4570,10 @@ case YY_STATE_EOF(INITIAL):
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
-#line 1897 "dhcp4_lexer.ll"
+#line 1899 "dhcp4_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 4574 "dhcp4_lexer.cc"
+#line 4576 "dhcp4_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5676,7 +5678,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 1897 "dhcp4_lexer.ll"
+#line 1899 "dhcp4_lexer.ll"
 
 
 using namespace isc::dhcp;
diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc
index 3ae6b44159..8acc25d018 100644
--- a/src/bin/dhcp4/dhcp4_parser.cc
+++ b/src/bin/dhcp4/dhcp4_parser.cc
@@ -1062,8 +1062,8 @@ namespace isc { namespace dhcp {
 #line 1063 "dhcp4_parser.cc"
     break;
 
-  case 114:
-#line 487 "dhcp4_parser.yy"
+  case 116:
+#line 489 "dhcp4_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("valid-lifetime", prf);
@@ -1071,8 +1071,8 @@ namespace isc { namespace dhcp {
 #line 1072 "dhcp4_parser.cc"
     break;
 
-  case 115:
-#line 492 "dhcp4_parser.yy"
+  case 117:
+#line 494 "dhcp4_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("min-valid-lifetime", prf);
@@ -1080,8 +1080,8 @@ namespace isc { namespace dhcp {
 #line 1081 "dhcp4_parser.cc"
     break;
 
-  case 116:
-#line 497 "dhcp4_parser.yy"
+  case 118:
+#line 499 "dhcp4_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-valid-lifetime", prf);
@@ -1089,8 +1089,8 @@ namespace isc { namespace dhcp {
 #line 1090 "dhcp4_parser.cc"
     break;
 
-  case 117:
-#line 502 "dhcp4_parser.yy"
+  case 119:
+#line 504 "dhcp4_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("renew-timer", prf);
@@ -1098,8 +1098,8 @@ namespace isc { namespace dhcp {
 #line 1099 "dhcp4_parser.cc"
     break;
 
-  case 118:
-#line 507 "dhcp4_parser.yy"
+  case 120:
+#line 509 "dhcp4_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rebind-timer", prf);
@@ -1107,8 +1107,8 @@ namespace isc { namespace dhcp {
 #line 1108 "dhcp4_parser.cc"
     break;
 
-  case 119:
-#line 512 "dhcp4_parser.yy"
+  case 121:
+#line 514 "dhcp4_parser.yy"
     {
     ElementPtr ctt(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("calculate-tee-times", ctt);
@@ -1116,8 +1116,8 @@ namespace isc { namespace dhcp {
 #line 1117 "dhcp4_parser.cc"
     break;
 
-  case 120:
-#line 517 "dhcp4_parser.yy"
+  case 122:
+#line 519 "dhcp4_parser.yy"
     {
     ElementPtr t1(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("t1-percent", t1);
@@ -1125,8 +1125,8 @@ namespace isc { namespace dhcp {
 #line 1126 "dhcp4_parser.cc"
     break;
 
-  case 121:
-#line 522 "dhcp4_parser.yy"
+  case 123:
+#line 524 "dhcp4_parser.yy"
     {
     ElementPtr t2(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("t2-percent", t2);
@@ -1134,8 +1134,8 @@ namespace isc { namespace dhcp {
 #line 1135 "dhcp4_parser.cc"
     break;
 
-  case 122:
-#line 527 "dhcp4_parser.yy"
+  case 124:
+#line 529 "dhcp4_parser.yy"
     {
     ElementPtr dpp(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("decline-probation-period", dpp);
@@ -1143,16 +1143,16 @@ namespace isc { namespace dhcp {
 #line 1144 "dhcp4_parser.cc"
     break;
 
-  case 123:
-#line 532 "dhcp4_parser.yy"
+  case 125:
+#line 534 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1152 "dhcp4_parser.cc"
     break;
 
-  case 124:
-#line 534 "dhcp4_parser.yy"
+  case 126:
+#line 536 "dhcp4_parser.yy"
     {
     ElementPtr stag(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-tag", stag);
@@ -1161,8 +1161,8 @@ namespace isc { namespace dhcp {
 #line 1162 "dhcp4_parser.cc"
     break;
 
-  case 125:
-#line 540 "dhcp4_parser.yy"
+  case 127:
+#line 542 "dhcp4_parser.yy"
     {
     ElementPtr echo(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("echo-client-id", echo);
@@ -1170,8 +1170,8 @@ namespace isc { namespace dhcp {
 #line 1171 "dhcp4_parser.cc"
     break;
 
-  case 126:
-#line 545 "dhcp4_parser.yy"
+  case 128:
+#line 547 "dhcp4_parser.yy"
     {
     ElementPtr match(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("match-client-id", match);
@@ -1179,8 +1179,8 @@ namespace isc { namespace dhcp {
 #line 1180 "dhcp4_parser.cc"
     break;
 
-  case 127:
-#line 550 "dhcp4_parser.yy"
+  case 129:
+#line 552 "dhcp4_parser.yy"
     {
     ElementPtr prf(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("authoritative", prf);
@@ -1188,8 +1188,8 @@ namespace isc { namespace dhcp {
 #line 1189 "dhcp4_parser.cc"
     break;
 
-  case 128:
-#line 556 "dhcp4_parser.yy"
+  case 130:
+#line 558 "dhcp4_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces-config", i);
@@ -1199,8 +1199,8 @@ namespace isc { namespace dhcp {
 #line 1200 "dhcp4_parser.cc"
     break;
 
-  case 129:
-#line 561 "dhcp4_parser.yy"
+  case 131:
+#line 563 "dhcp4_parser.yy"
     {
     // No interfaces config param is required
     ctx.stack_.pop_back();
@@ -1209,8 +1209,8 @@ namespace isc { namespace dhcp {
 #line 1210 "dhcp4_parser.cc"
     break;
 
-  case 139:
-#line 580 "dhcp4_parser.yy"
+  case 141:
+#line 582 "dhcp4_parser.yy"
     {
     // Parse the interfaces-config map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1219,8 +1219,8 @@ namespace isc { namespace dhcp {
 #line 1220 "dhcp4_parser.cc"
     break;
 
-  case 140:
-#line 584 "dhcp4_parser.yy"
+  case 142:
+#line 586 "dhcp4_parser.yy"
     {
     // No interfaces config param is required
     // parsing completed
@@ -1228,8 +1228,8 @@ namespace isc { namespace dhcp {
 #line 1229 "dhcp4_parser.cc"
     break;
 
-  case 141:
-#line 589 "dhcp4_parser.yy"
+  case 143:
+#line 591 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces", l);
@@ -1239,8 +1239,8 @@ namespace isc { namespace dhcp {
 #line 1240 "dhcp4_parser.cc"
     break;
 
-  case 142:
-#line 594 "dhcp4_parser.yy"
+  case 144:
+#line 596 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1248,16 +1248,16 @@ namespace isc { namespace dhcp {
 #line 1249 "dhcp4_parser.cc"
     break;
 
-  case 143:
-#line 599 "dhcp4_parser.yy"
+  case 145:
+#line 601 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.DHCP_SOCKET_TYPE);
 }
 #line 1257 "dhcp4_parser.cc"
     break;
 
-  case 144:
-#line 601 "dhcp4_parser.yy"
+  case 146:
+#line 603 "dhcp4_parser.yy"
     {
     ctx.stack_.back()->set("dhcp-socket-type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -1265,28 +1265,28 @@ namespace isc { namespace dhcp {
 #line 1266 "dhcp4_parser.cc"
     break;
 
-  case 145:
-#line 606 "dhcp4_parser.yy"
+  case 147:
+#line 608 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("raw", ctx.loc2pos(yystack_[0].location))); }
 #line 1272 "dhcp4_parser.cc"
     break;
 
-  case 146:
-#line 607 "dhcp4_parser.yy"
+  case 148:
+#line 609 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("udp", ctx.loc2pos(yystack_[0].location))); }
 #line 1278 "dhcp4_parser.cc"
     break;
 
-  case 147:
-#line 610 "dhcp4_parser.yy"
+  case 149:
+#line 612 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.OUTBOUND_INTERFACE);
 }
 #line 1286 "dhcp4_parser.cc"
     break;
 
-  case 148:
-#line 612 "dhcp4_parser.yy"
+  case 150:
+#line 614 "dhcp4_parser.yy"
     {
     ctx.stack_.back()->set("outbound-interface", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -1294,24 +1294,24 @@ namespace isc { namespace dhcp {
 #line 1295 "dhcp4_parser.cc"
     break;
 
-  case 149:
-#line 617 "dhcp4_parser.yy"
+  case 151:
+#line 619 "dhcp4_parser.yy"
     {
     yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("same-as-inbound", ctx.loc2pos(yystack_[0].location)));
 }
 #line 1303 "dhcp4_parser.cc"
     break;
 
-  case 150:
-#line 619 "dhcp4_parser.yy"
+  case 152:
+#line 621 "dhcp4_parser.yy"
     {
     yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("use-routing", ctx.loc2pos(yystack_[0].location)));
     }
 #line 1311 "dhcp4_parser.cc"
     break;
 
-  case 151:
-#line 623 "dhcp4_parser.yy"
+  case 153:
+#line 625 "dhcp4_parser.yy"
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("re-detect", b);
@@ -1319,8 +1319,8 @@ namespace isc { namespace dhcp {
 #line 1320 "dhcp4_parser.cc"
     break;
 
-  case 152:
-#line 629 "dhcp4_parser.yy"
+  case 154:
+#line 631 "dhcp4_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lease-database", i);
@@ -1330,8 +1330,8 @@ namespace isc { namespace dhcp {
 #line 1331 "dhcp4_parser.cc"
     break;
 
-  case 153:
-#line 634 "dhcp4_parser.yy"
+  case 155:
+#line 636 "dhcp4_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1341,8 +1341,8 @@ namespace isc { namespace dhcp {
 #line 1342 "dhcp4_parser.cc"
     break;
 
-  case 154:
-#line 641 "dhcp4_parser.yy"
+  case 156:
+#line 643 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sanity-checks", m);
@@ -1352,8 +1352,8 @@ namespace isc { namespace dhcp {
 #line 1353 "dhcp4_parser.cc"
     break;
 
-  case 155:
-#line 646 "dhcp4_parser.yy"
+  case 157:
+#line 648 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1361,16 +1361,16 @@ namespace isc { namespace dhcp {
 #line 1362 "dhcp4_parser.cc"
     break;
 
-  case 159:
-#line 656 "dhcp4_parser.yy"
+  case 161:
+#line 658 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1370 "dhcp4_parser.cc"
     break;
 
-  case 160:
-#line 658 "dhcp4_parser.yy"
+  case 162:
+#line 660 "dhcp4_parser.yy"
     {
 
     if ( (string(yystack_[0].value.as < std::string > ()) == "none") ||
@@ -1389,8 +1389,8 @@ namespace isc { namespace dhcp {
 #line 1390 "dhcp4_parser.cc"
     break;
 
-  case 161:
-#line 674 "dhcp4_parser.yy"
+  case 163:
+#line 676 "dhcp4_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-database", i);
@@ -1400,8 +1400,8 @@ namespace isc { namespace dhcp {
 #line 1401 "dhcp4_parser.cc"
     break;
 
-  case 162:
-#line 679 "dhcp4_parser.yy"
+  case 164:
+#line 681 "dhcp4_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1411,8 +1411,8 @@ namespace isc { namespace dhcp {
 #line 1412 "dhcp4_parser.cc"
     break;
 
-  case 163:
-#line 686 "dhcp4_parser.yy"
+  case 165:
+#line 688 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-databases", l);
@@ -1422,8 +1422,8 @@ namespace isc { namespace dhcp {
 #line 1423 "dhcp4_parser.cc"
     break;
 
-  case 164:
-#line 691 "dhcp4_parser.yy"
+  case 166:
+#line 693 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1431,8 +1431,8 @@ namespace isc { namespace dhcp {
 #line 1432 "dhcp4_parser.cc"
     break;
 
-  case 169:
-#line 704 "dhcp4_parser.yy"
+  case 171:
+#line 706 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1441,8 +1441,8 @@ namespace isc { namespace dhcp {
 #line 1442 "dhcp4_parser.cc"
     break;
 
-  case 170:
-#line 708 "dhcp4_parser.yy"
+  case 172:
+#line 710 "dhcp4_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1451,16 +1451,16 @@ namespace isc { namespace dhcp {
 #line 1452 "dhcp4_parser.cc"
     break;
 
-  case 193:
-#line 740 "dhcp4_parser.yy"
+  case 195:
+#line 742 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.DATABASE_TYPE);
 }
 #line 1460 "dhcp4_parser.cc"
     break;
 
-  case 194:
-#line 742 "dhcp4_parser.yy"
+  case 196:
+#line 744 "dhcp4_parser.yy"
     {
     ctx.stack_.back()->set("type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -1468,40 +1468,40 @@ namespace isc { namespace dhcp {
 #line 1469 "dhcp4_parser.cc"
     break;
 
-  case 195:
-#line 747 "dhcp4_parser.yy"
+  case 197:
+#line 749 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); }
 #line 1475 "dhcp4_parser.cc"
     break;
 
-  case 196:
-#line 748 "dhcp4_parser.yy"
+  case 198:
+#line 750 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); }
 #line 1481 "dhcp4_parser.cc"
     break;
 
-  case 197:
-#line 749 "dhcp4_parser.yy"
+  case 199:
+#line 751 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); }
 #line 1487 "dhcp4_parser.cc"
     break;
 
-  case 198:
-#line 750 "dhcp4_parser.yy"
+  case 200:
+#line 752 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); }
 #line 1493 "dhcp4_parser.cc"
     break;
 
-  case 199:
-#line 753 "dhcp4_parser.yy"
+  case 201:
+#line 755 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1501 "dhcp4_parser.cc"
     break;
 
-  case 200:
-#line 755 "dhcp4_parser.yy"
+  case 202:
+#line 757 "dhcp4_parser.yy"
     {
     ElementPtr user(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user", user);
@@ -1510,16 +1510,16 @@ namespace isc { namespace dhcp {
 #line 1511 "dhcp4_parser.cc"
     break;
 
-  case 201:
-#line 761 "dhcp4_parser.yy"
+  case 203:
+#line 763 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1519 "dhcp4_parser.cc"
     break;
 
-  case 202:
-#line 763 "dhcp4_parser.yy"
+  case 204:
+#line 765 "dhcp4_parser.yy"
     {
     ElementPtr pwd(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password", pwd);
@@ -1528,16 +1528,16 @@ namespace isc { namespace dhcp {
 #line 1529 "dhcp4_parser.cc"
     break;
 
-  case 203:
-#line 769 "dhcp4_parser.yy"
+  case 205:
+#line 771 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1537 "dhcp4_parser.cc"
     break;
 
-  case 204:
-#line 771 "dhcp4_parser.yy"
+  case 206:
+#line 773 "dhcp4_parser.yy"
     {
     ElementPtr h(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host", h);
@@ -1546,8 +1546,8 @@ namespace isc { namespace dhcp {
 #line 1547 "dhcp4_parser.cc"
     break;
 
-  case 205:
-#line 777 "dhcp4_parser.yy"
+  case 207:
+#line 779 "dhcp4_parser.yy"
     {
     ElementPtr p(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", p);
@@ -1555,16 +1555,16 @@ namespace isc { namespace dhcp {
 #line 1556 "dhcp4_parser.cc"
     break;
 
-  case 206:
-#line 782 "dhcp4_parser.yy"
+  case 208:
+#line 784 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1564 "dhcp4_parser.cc"
     break;
 
-  case 207:
-#line 784 "dhcp4_parser.yy"
+  case 209:
+#line 786 "dhcp4_parser.yy"
     {
     ElementPtr name(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
@@ -1573,8 +1573,8 @@ namespace isc { namespace dhcp {
 #line 1574 "dhcp4_parser.cc"
     break;
 
-  case 208:
-#line 790 "dhcp4_parser.yy"
+  case 210:
+#line 792 "dhcp4_parser.yy"
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("persist", n);
@@ -1582,8 +1582,8 @@ namespace isc { namespace dhcp {
 #line 1583 "dhcp4_parser.cc"
     break;
 
-  case 209:
-#line 795 "dhcp4_parser.yy"
+  case 211:
+#line 797 "dhcp4_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lfc-interval", n);
@@ -1591,8 +1591,8 @@ namespace isc { namespace dhcp {
 #line 1592 "dhcp4_parser.cc"
     break;
 
-  case 210:
-#line 800 "dhcp4_parser.yy"
+  case 212:
+#line 802 "dhcp4_parser.yy"
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("readonly", n);
@@ -1600,8 +1600,8 @@ namespace isc { namespace dhcp {
 #line 1601 "dhcp4_parser.cc"
     break;
 
-  case 211:
-#line 805 "dhcp4_parser.yy"
+  case 213:
+#line 807 "dhcp4_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("connect-timeout", n);
@@ -1609,8 +1609,8 @@ namespace isc { namespace dhcp {
 #line 1610 "dhcp4_parser.cc"
     break;
 
-  case 212:
-#line 810 "dhcp4_parser.yy"
+  case 214:
+#line 812 "dhcp4_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("request-timeout", n);
@@ -1618,8 +1618,8 @@ namespace isc { namespace dhcp {
 #line 1619 "dhcp4_parser.cc"
     break;
 
-  case 213:
-#line 815 "dhcp4_parser.yy"
+  case 215:
+#line 817 "dhcp4_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-keepalive", n);
@@ -1627,8 +1627,8 @@ namespace isc { namespace dhcp {
 #line 1628 "dhcp4_parser.cc"
     break;
 
-  case 214:
-#line 820 "dhcp4_parser.yy"
+  case 216:
+#line 822 "dhcp4_parser.yy"
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-nodelay", n);
@@ -1636,16 +1636,16 @@ namespace isc { namespace dhcp {
 #line 1637 "dhcp4_parser.cc"
     break;
 
-  case 215:
-#line 825 "dhcp4_parser.yy"
+  case 217:
+#line 827 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1645 "dhcp4_parser.cc"
     break;
 
-  case 216:
-#line 827 "dhcp4_parser.yy"
+  case 218:
+#line 829 "dhcp4_parser.yy"
     {
     ElementPtr cp(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("contact-points", cp);
@@ -1654,16 +1654,16 @@ namespace isc { namespace dhcp {
 #line 1655 "dhcp4_parser.cc"
     break;
 
-  case 217:
-#line 833 "dhcp4_parser.yy"
+  case 219:
+#line 835 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1663 "dhcp4_parser.cc"
     break;
 
-  case 218:
-#line 835 "dhcp4_parser.yy"
+  case 220:
+#line 837 "dhcp4_parser.yy"
     {
     ElementPtr ks(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("keyspace", ks);
@@ -1672,16 +1672,16 @@ namespace isc { namespace dhcp {
 #line 1673 "dhcp4_parser.cc"
     break;
 
-  case 219:
-#line 841 "dhcp4_parser.yy"
+  case 221:
+#line 843 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1681 "dhcp4_parser.cc"
     break;
 
-  case 220:
-#line 843 "dhcp4_parser.yy"
+  case 222:
+#line 845 "dhcp4_parser.yy"
     {
     ElementPtr c(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("consistency", c);
@@ -1690,16 +1690,16 @@ namespace isc { namespace dhcp {
 #line 1691 "dhcp4_parser.cc"
     break;
 
-  case 221:
-#line 849 "dhcp4_parser.yy"
+  case 223:
+#line 851 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1699 "dhcp4_parser.cc"
     break;
 
-  case 222:
-#line 851 "dhcp4_parser.yy"
+  case 224:
+#line 853 "dhcp4_parser.yy"
     {
     ElementPtr c(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("serial-consistency", c);
@@ -1708,8 +1708,8 @@ namespace isc { namespace dhcp {
 #line 1709 "dhcp4_parser.cc"
     break;
 
-  case 223:
-#line 857 "dhcp4_parser.yy"
+  case 225:
+#line 859 "dhcp4_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reconnect-tries", n);
@@ -1717,8 +1717,8 @@ namespace isc { namespace dhcp {
 #line 1718 "dhcp4_parser.cc"
     break;
 
-  case 224:
-#line 862 "dhcp4_parser.yy"
+  case 226:
+#line 864 "dhcp4_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reconnect-wait-time", n);
@@ -1726,8 +1726,8 @@ namespace isc { namespace dhcp {
 #line 1727 "dhcp4_parser.cc"
     break;
 
-  case 225:
-#line 867 "dhcp4_parser.yy"
+  case 227:
+#line 869 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host-reservation-identifiers", l);
@@ -1737,8 +1737,8 @@ namespace isc { namespace dhcp {
 #line 1738 "dhcp4_parser.cc"
     break;
 
-  case 226:
-#line 872 "dhcp4_parser.yy"
+  case 228:
+#line 874 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1746,8 +1746,8 @@ namespace isc { namespace dhcp {
 #line 1747 "dhcp4_parser.cc"
     break;
 
-  case 234:
-#line 888 "dhcp4_parser.yy"
+  case 236:
+#line 890 "dhcp4_parser.yy"
     {
     ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
@@ -1755,8 +1755,8 @@ namespace isc { namespace dhcp {
 #line 1756 "dhcp4_parser.cc"
     break;
 
-  case 235:
-#line 893 "dhcp4_parser.yy"
+  case 237:
+#line 895 "dhcp4_parser.yy"
     {
     ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(hwaddr);
@@ -1764,8 +1764,8 @@ namespace isc { namespace dhcp {
 #line 1765 "dhcp4_parser.cc"
     break;
 
-  case 236:
-#line 898 "dhcp4_parser.yy"
+  case 238:
+#line 900 "dhcp4_parser.yy"
     {
     ElementPtr circuit(new StringElement("circuit-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(circuit);
@@ -1773,8 +1773,8 @@ namespace isc { namespace dhcp {
 #line 1774 "dhcp4_parser.cc"
     break;
 
-  case 237:
-#line 903 "dhcp4_parser.yy"
+  case 239:
+#line 905 "dhcp4_parser.yy"
     {
     ElementPtr client(new StringElement("client-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(client);
@@ -1782,8 +1782,8 @@ namespace isc { namespace dhcp {
 #line 1783 "dhcp4_parser.cc"
     break;
 
-  case 238:
-#line 908 "dhcp4_parser.yy"
+  case 240:
+#line 910 "dhcp4_parser.yy"
     {
     ElementPtr flex_id(new StringElement("flex-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(flex_id);
@@ -1791,8 +1791,8 @@ namespace isc { namespace dhcp {
 #line 1792 "dhcp4_parser.cc"
     break;
 
-  case 239:
-#line 913 "dhcp4_parser.yy"
+  case 241:
+#line 915 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hooks-libraries", l);
@@ -1802,8 +1802,8 @@ namespace isc { namespace dhcp {
 #line 1803 "dhcp4_parser.cc"
     break;
 
-  case 240:
-#line 918 "dhcp4_parser.yy"
+  case 242:
+#line 920 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1811,8 +1811,8 @@ namespace isc { namespace dhcp {
 #line 1812 "dhcp4_parser.cc"
     break;
 
-  case 245:
-#line 931 "dhcp4_parser.yy"
+  case 247:
+#line 933 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1821,8 +1821,8 @@ namespace isc { namespace dhcp {
 #line 1822 "dhcp4_parser.cc"
     break;
 
-  case 246:
-#line 935 "dhcp4_parser.yy"
+  case 248:
+#line 937 "dhcp4_parser.yy"
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1831,8 +1831,8 @@ namespace isc { namespace dhcp {
 #line 1832 "dhcp4_parser.cc"
     break;
 
-  case 247:
-#line 941 "dhcp4_parser.yy"
+  case 249:
+#line 943 "dhcp4_parser.yy"
     {
     // Parse the hooks-libraries list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1841,8 +1841,8 @@ namespace isc { namespace dhcp {
 #line 1842 "dhcp4_parser.cc"
     break;
 
-  case 248:
-#line 945 "dhcp4_parser.yy"
+  case 250:
+#line 947 "dhcp4_parser.yy"
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1851,16 +1851,16 @@ namespace isc { namespace dhcp {
 #line 1852 "dhcp4_parser.cc"
     break;
 
-  case 254:
-#line 960 "dhcp4_parser.yy"
+  case 256:
+#line 962 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1860 "dhcp4_parser.cc"
     break;
 
-  case 255:
-#line 962 "dhcp4_parser.yy"
+  case 257:
+#line 964 "dhcp4_parser.yy"
     {
     ElementPtr lib(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("library", lib);
@@ -1869,16 +1869,16 @@ namespace isc { namespace dhcp {
 #line 1870 "dhcp4_parser.cc"
     break;
 
-  case 256:
-#line 968 "dhcp4_parser.yy"
+  case 258:
+#line 970 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1878 "dhcp4_parser.cc"
     break;
 
-  case 257:
-#line 970 "dhcp4_parser.yy"
+  case 259:
+#line 972 "dhcp4_parser.yy"
     {
     ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -1886,8 +1886,8 @@ namespace isc { namespace dhcp {
 #line 1887 "dhcp4_parser.cc"
     break;
 
-  case 258:
-#line 976 "dhcp4_parser.yy"
+  case 260:
+#line 978 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("expired-leases-processing", m);
@@ -1897,8 +1897,8 @@ namespace isc { namespace dhcp {
 #line 1898 "dhcp4_parser.cc"
     break;
 
-  case 259:
-#line 981 "dhcp4_parser.yy"
+  case 261:
+#line 983 "dhcp4_parser.yy"
     {
     // No expired lease parameter is required
     ctx.stack_.pop_back();
@@ -1907,8 +1907,8 @@ namespace isc { namespace dhcp {
 #line 1908 "dhcp4_parser.cc"
     break;
 
-  case 268:
-#line 999 "dhcp4_parser.yy"
+  case 270:
+#line 1001 "dhcp4_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reclaim-timer-wait-time", value);
@@ -1916,8 +1916,8 @@ namespace isc { namespace dhcp {
 #line 1917 "dhcp4_parser.cc"
     break;
 
-  case 269:
-#line 1004 "dhcp4_parser.yy"
+  case 271:
+#line 1006 "dhcp4_parser.yy"
     {
     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);
@@ -1925,8 +1925,8 @@ namespace isc { namespace dhcp {
 #line 1926 "dhcp4_parser.cc"
     break;
 
-  case 270:
-#line 1009 "dhcp4_parser.yy"
+  case 272:
+#line 1011 "dhcp4_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hold-reclaimed-time", value);
@@ -1934,8 +1934,8 @@ namespace isc { namespace dhcp {
 #line 1935 "dhcp4_parser.cc"
     break;
 
-  case 271:
-#line 1014 "dhcp4_parser.yy"
+  case 273:
+#line 1016 "dhcp4_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-leases", value);
@@ -1943,8 +1943,8 @@ namespace isc { namespace dhcp {
 #line 1944 "dhcp4_parser.cc"
     break;
 
-  case 272:
-#line 1019 "dhcp4_parser.yy"
+  case 274:
+#line 1021 "dhcp4_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-time", value);
@@ -1952,8 +1952,8 @@ namespace isc { namespace dhcp {
 #line 1953 "dhcp4_parser.cc"
     break;
 
-  case 273:
-#line 1024 "dhcp4_parser.yy"
+  case 275:
+#line 1026 "dhcp4_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("unwarned-reclaim-cycles", value);
@@ -1961,8 +1961,8 @@ namespace isc { namespace dhcp {
 #line 1962 "dhcp4_parser.cc"
     break;
 
-  case 274:
-#line 1032 "dhcp4_parser.yy"
+  case 276:
+#line 1034 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet4", l);
@@ -1972,8 +1972,8 @@ namespace isc { namespace dhcp {
 #line 1973 "dhcp4_parser.cc"
     break;
 
-  case 275:
-#line 1037 "dhcp4_parser.yy"
+  case 277:
+#line 1039 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1981,8 +1981,8 @@ namespace isc { namespace dhcp {
 #line 1982 "dhcp4_parser.cc"
     break;
 
-  case 280:
-#line 1057 "dhcp4_parser.yy"
+  case 282:
+#line 1059 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1991,8 +1991,8 @@ namespace isc { namespace dhcp {
 #line 1992 "dhcp4_parser.cc"
     break;
 
-  case 281:
-#line 1061 "dhcp4_parser.yy"
+  case 283:
+#line 1063 "dhcp4_parser.yy"
     {
     // Once we reached this place, the subnet parsing is now complete.
     // If we want to, we can implement default values here.
@@ -2017,8 +2017,8 @@ namespace isc { namespace dhcp {
 #line 2018 "dhcp4_parser.cc"
     break;
 
-  case 282:
-#line 1083 "dhcp4_parser.yy"
+  case 284:
+#line 1085 "dhcp4_parser.yy"
     {
     // Parse the subnet4 list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2027,8 +2027,8 @@ namespace isc { namespace dhcp {
 #line 2028 "dhcp4_parser.cc"
     break;
 
-  case 283:
-#line 1087 "dhcp4_parser.yy"
+  case 285:
+#line 1089 "dhcp4_parser.yy"
     {
     // The subnet subnet4 parameter is required
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2037,16 +2037,16 @@ namespace isc { namespace dhcp {
 #line 2038 "dhcp4_parser.cc"
     break;
 
-  case 315:
-#line 1130 "dhcp4_parser.yy"
+  case 317:
+#line 1132 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2046 "dhcp4_parser.cc"
     break;
 
-  case 316:
-#line 1132 "dhcp4_parser.yy"
+  case 318:
+#line 1134 "dhcp4_parser.yy"
     {
     ElementPtr subnet(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet", subnet);
@@ -2055,16 +2055,16 @@ namespace isc { namespace dhcp {
 #line 2056 "dhcp4_parser.cc"
     break;
 
-  case 317:
-#line 1138 "dhcp4_parser.yy"
+  case 319:
+#line 1140 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2064 "dhcp4_parser.cc"
     break;
 
-  case 318:
-#line 1140 "dhcp4_parser.yy"
+  case 320:
+#line 1142 "dhcp4_parser.yy"
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-interface", iface);
@@ -2073,16 +2073,16 @@ namespace isc { namespace dhcp {
 #line 2074 "dhcp4_parser.cc"
     break;
 
-  case 319:
-#line 1146 "dhcp4_parser.yy"
+  case 321:
+#line 1148 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2082 "dhcp4_parser.cc"
     break;
 
-  case 320:
-#line 1148 "dhcp4_parser.yy"
+  case 322:
+#line 1150 "dhcp4_parser.yy"
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-interface-id", iface);
@@ -2091,16 +2091,16 @@ namespace isc { namespace dhcp {
 #line 2092 "dhcp4_parser.cc"
     break;
 
-  case 321:
-#line 1154 "dhcp4_parser.yy"
+  case 323:
+#line 1156 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2100 "dhcp4_parser.cc"
     break;
 
-  case 322:
-#line 1156 "dhcp4_parser.yy"
+  case 324:
+#line 1158 "dhcp4_parser.yy"
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-subnet", iface);
@@ -2109,16 +2109,16 @@ namespace isc { namespace dhcp {
 #line 2110 "dhcp4_parser.cc"
     break;
 
-  case 323:
-#line 1162 "dhcp4_parser.yy"
+  case 325:
+#line 1164 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2118 "dhcp4_parser.cc"
     break;
 
-  case 324:
-#line 1164 "dhcp4_parser.yy"
+  case 326:
+#line 1166 "dhcp4_parser.yy"
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface", iface);
@@ -2127,16 +2127,16 @@ namespace isc { namespace dhcp {
 #line 2128 "dhcp4_parser.cc"
     break;
 
-  case 325:
-#line 1170 "dhcp4_parser.yy"
+  case 327:
+#line 1172 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2136 "dhcp4_parser.cc"
     break;
 
-  case 326:
-#line 1172 "dhcp4_parser.yy"
+  case 328:
+#line 1174 "dhcp4_parser.yy"
     {
     ElementPtr cls(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-class", cls);
@@ -2145,8 +2145,8 @@ namespace isc { namespace dhcp {
 #line 2146 "dhcp4_parser.cc"
     break;
 
-  case 327:
-#line 1178 "dhcp4_parser.yy"
+  case 329:
+#line 1180 "dhcp4_parser.yy"
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("require-client-classes", c);
@@ -2156,8 +2156,8 @@ namespace isc { namespace dhcp {
 #line 2157 "dhcp4_parser.cc"
     break;
 
-  case 328:
-#line 1183 "dhcp4_parser.yy"
+  case 330:
+#line 1185 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2165,16 +2165,16 @@ namespace isc { namespace dhcp {
 #line 2166 "dhcp4_parser.cc"
     break;
 
-  case 329:
-#line 1188 "dhcp4_parser.yy"
+  case 331:
+#line 1190 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.RESERVATION_MODE);
 }
 #line 2174 "dhcp4_parser.cc"
     break;
 
-  case 330:
-#line 1190 "dhcp4_parser.yy"
+  case 332:
+#line 1192 "dhcp4_parser.yy"
     {
     ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -2182,32 +2182,32 @@ namespace isc { namespace dhcp {
 #line 2183 "dhcp4_parser.cc"
     break;
 
-  case 331:
-#line 1195 "dhcp4_parser.yy"
+  case 333:
+#line 1197 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); }
 #line 2189 "dhcp4_parser.cc"
     break;
 
-  case 332:
-#line 1196 "dhcp4_parser.yy"
+  case 334:
+#line 1198 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); }
 #line 2195 "dhcp4_parser.cc"
     break;
 
-  case 333:
-#line 1197 "dhcp4_parser.yy"
+  case 335:
+#line 1199 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("global", ctx.loc2pos(yystack_[0].location))); }
 #line 2201 "dhcp4_parser.cc"
     break;
 
-  case 334:
-#line 1198 "dhcp4_parser.yy"
+  case 336:
+#line 1200 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); }
 #line 2207 "dhcp4_parser.cc"
     break;
 
-  case 335:
-#line 1201 "dhcp4_parser.yy"
+  case 337:
+#line 1203 "dhcp4_parser.yy"
     {
     ElementPtr id(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("id", id);
@@ -2215,8 +2215,8 @@ namespace isc { namespace dhcp {
 #line 2216 "dhcp4_parser.cc"
     break;
 
-  case 336:
-#line 1208 "dhcp4_parser.yy"
+  case 338:
+#line 1210 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("shared-networks", l);
@@ -2226,8 +2226,8 @@ namespace isc { namespace dhcp {
 #line 2227 "dhcp4_parser.cc"
     break;
 
-  case 337:
-#line 1213 "dhcp4_parser.yy"
+  case 339:
+#line 1215 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2235,8 +2235,8 @@ namespace isc { namespace dhcp {
 #line 2236 "dhcp4_parser.cc"
     break;
 
-  case 342:
-#line 1228 "dhcp4_parser.yy"
+  case 344:
+#line 1230 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2245,16 +2245,16 @@ namespace isc { namespace dhcp {
 #line 2246 "dhcp4_parser.cc"
     break;
 
-  case 343:
-#line 1232 "dhcp4_parser.yy"
+  case 345:
+#line 1234 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
 }
 #line 2254 "dhcp4_parser.cc"
     break;
 
-  case 370:
-#line 1270 "dhcp4_parser.yy"
+  case 372:
+#line 1272 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-def", l);
@@ -2264,8 +2264,8 @@ namespace isc { namespace dhcp {
 #line 2265 "dhcp4_parser.cc"
     break;
 
-  case 371:
-#line 1275 "dhcp4_parser.yy"
+  case 373:
+#line 1277 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2273,8 +2273,8 @@ namespace isc { namespace dhcp {
 #line 2274 "dhcp4_parser.cc"
     break;
 
-  case 372:
-#line 1283 "dhcp4_parser.yy"
+  case 374:
+#line 1285 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
@@ -2282,16 +2282,16 @@ namespace isc { namespace dhcp {
 #line 2283 "dhcp4_parser.cc"
     break;
 
-  case 373:
-#line 1286 "dhcp4_parser.yy"
+  case 375:
+#line 1288 "dhcp4_parser.yy"
     {
     // parsing completed
 }
 #line 2291 "dhcp4_parser.cc"
     break;
 
-  case 378:
-#line 1302 "dhcp4_parser.yy"
+  case 380:
+#line 1304 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2300,8 +2300,8 @@ namespace isc { namespace dhcp {
 #line 2301 "dhcp4_parser.cc"
     break;
 
-  case 379:
-#line 1306 "dhcp4_parser.yy"
+  case 381:
+#line 1308 "dhcp4_parser.yy"
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2312,8 +2312,8 @@ namespace isc { namespace dhcp {
 #line 2313 "dhcp4_parser.cc"
     break;
 
-  case 380:
-#line 1317 "dhcp4_parser.yy"
+  case 382:
+#line 1319 "dhcp4_parser.yy"
     {
     // Parse the option-def list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2322,8 +2322,8 @@ namespace isc { namespace dhcp {
 #line 2323 "dhcp4_parser.cc"
     break;
 
-  case 381:
-#line 1321 "dhcp4_parser.yy"
+  case 383:
+#line 1323 "dhcp4_parser.yy"
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2334,8 +2334,8 @@ namespace isc { namespace dhcp {
 #line 2335 "dhcp4_parser.cc"
     break;
 
-  case 397:
-#line 1353 "dhcp4_parser.yy"
+  case 399:
+#line 1355 "dhcp4_parser.yy"
     {
     ElementPtr code(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("code", code);
@@ -2343,16 +2343,16 @@ namespace isc { namespace dhcp {
 #line 2344 "dhcp4_parser.cc"
     break;
 
-  case 399:
-#line 1360 "dhcp4_parser.yy"
+  case 401:
+#line 1362 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2352 "dhcp4_parser.cc"
     break;
 
-  case 400:
-#line 1362 "dhcp4_parser.yy"
+  case 402:
+#line 1364 "dhcp4_parser.yy"
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("type", prf);
@@ -2361,16 +2361,16 @@ namespace isc { namespace dhcp {
 #line 2362 "dhcp4_parser.cc"
     break;
 
-  case 401:
-#line 1368 "dhcp4_parser.yy"
+  case 403:
+#line 1370 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2370 "dhcp4_parser.cc"
     break;
 
-  case 402:
-#line 1370 "dhcp4_parser.yy"
+  case 404:
+#line 1372 "dhcp4_parser.yy"
     {
     ElementPtr rtypes(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("record-types", rtypes);
@@ -2379,16 +2379,16 @@ namespace isc { namespace dhcp {
 #line 2380 "dhcp4_parser.cc"
     break;
 
-  case 403:
-#line 1376 "dhcp4_parser.yy"
+  case 405:
+#line 1378 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2388 "dhcp4_parser.cc"
     break;
 
-  case 404:
-#line 1378 "dhcp4_parser.yy"
+  case 406:
+#line 1380 "dhcp4_parser.yy"
     {
     ElementPtr space(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("space", space);
@@ -2397,16 +2397,16 @@ namespace isc { namespace dhcp {
 #line 2398 "dhcp4_parser.cc"
     break;
 
-  case 406:
-#line 1386 "dhcp4_parser.yy"
+  case 408:
+#line 1388 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2406 "dhcp4_parser.cc"
     break;
 
-  case 407:
-#line 1388 "dhcp4_parser.yy"
+  case 409:
+#line 1390 "dhcp4_parser.yy"
     {
     ElementPtr encap(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("encapsulate", encap);
@@ -2415,8 +2415,8 @@ namespace isc { namespace dhcp {
 #line 2416 "dhcp4_parser.cc"
     break;
 
-  case 408:
-#line 1394 "dhcp4_parser.yy"
+  case 410:
+#line 1396 "dhcp4_parser.yy"
     {
     ElementPtr array(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("array", array);
@@ -2424,8 +2424,8 @@ namespace isc { namespace dhcp {
 #line 2425 "dhcp4_parser.cc"
     break;
 
-  case 409:
-#line 1403 "dhcp4_parser.yy"
+  case 411:
+#line 1405 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-data", l);
@@ -2435,8 +2435,8 @@ namespace isc { namespace dhcp {
 #line 2436 "dhcp4_parser.cc"
     break;
 
-  case 410:
-#line 1408 "dhcp4_parser.yy"
+  case 412:
+#line 1410 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2444,8 +2444,8 @@ namespace isc { namespace dhcp {
 #line 2445 "dhcp4_parser.cc"
     break;
 
-  case 415:
-#line 1427 "dhcp4_parser.yy"
+  case 417:
+#line 1429 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2454,8 +2454,8 @@ namespace isc { namespace dhcp {
 #line 2455 "dhcp4_parser.cc"
     break;
 
-  case 416:
-#line 1431 "dhcp4_parser.yy"
+  case 418:
+#line 1433 "dhcp4_parser.yy"
     {
     /// @todo: the code or name parameters are required.
     ctx.stack_.pop_back();
@@ -2463,8 +2463,8 @@ namespace isc { namespace dhcp {
 #line 2464 "dhcp4_parser.cc"
     break;
 
-  case 417:
-#line 1439 "dhcp4_parser.yy"
+  case 419:
+#line 1441 "dhcp4_parser.yy"
     {
     // Parse the option-data list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2473,8 +2473,8 @@ namespace isc { namespace dhcp {
 #line 2474 "dhcp4_parser.cc"
     break;
 
-  case 418:
-#line 1443 "dhcp4_parser.yy"
+  case 420:
+#line 1445 "dhcp4_parser.yy"
     {
     /// @todo: the code or name parameters are required.
     // parsing completed
@@ -2482,16 +2482,16 @@ namespace isc { namespace dhcp {
 #line 2483 "dhcp4_parser.cc"
     break;
 
-  case 433:
-#line 1476 "dhcp4_parser.yy"
+  case 435:
+#line 1478 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2491 "dhcp4_parser.cc"
     break;
 
-  case 434:
-#line 1478 "dhcp4_parser.yy"
+  case 436:
+#line 1480 "dhcp4_parser.yy"
     {
     ElementPtr data(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
@@ -2500,8 +2500,8 @@ namespace isc { namespace dhcp {
 #line 2501 "dhcp4_parser.cc"
     break;
 
-  case 437:
-#line 1488 "dhcp4_parser.yy"
+  case 439:
+#line 1490 "dhcp4_parser.yy"
     {
     ElementPtr space(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", space);
@@ -2509,8 +2509,8 @@ namespace isc { namespace dhcp {
 #line 2510 "dhcp4_parser.cc"
     break;
 
-  case 438:
-#line 1493 "dhcp4_parser.yy"
+  case 440:
+#line 1495 "dhcp4_parser.yy"
     {
     ElementPtr persist(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
@@ -2518,8 +2518,8 @@ namespace isc { namespace dhcp {
 #line 2519 "dhcp4_parser.cc"
     break;
 
-  case 439:
-#line 1501 "dhcp4_parser.yy"
+  case 441:
+#line 1503 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pools", l);
@@ -2529,8 +2529,8 @@ namespace isc { namespace dhcp {
 #line 2530 "dhcp4_parser.cc"
     break;
 
-  case 440:
-#line 1506 "dhcp4_parser.yy"
+  case 442:
+#line 1508 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2538,8 +2538,8 @@ namespace isc { namespace dhcp {
 #line 2539 "dhcp4_parser.cc"
     break;
 
-  case 445:
-#line 1521 "dhcp4_parser.yy"
+  case 447:
+#line 1523 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2548,8 +2548,8 @@ namespace isc { namespace dhcp {
 #line 2549 "dhcp4_parser.cc"
     break;
 
-  case 446:
-#line 1525 "dhcp4_parser.yy"
+  case 448:
+#line 1527 "dhcp4_parser.yy"
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2558,8 +2558,8 @@ namespace isc { namespace dhcp {
 #line 2559 "dhcp4_parser.cc"
     break;
 
-  case 447:
-#line 1531 "dhcp4_parser.yy"
+  case 449:
+#line 1533 "dhcp4_parser.yy"
     {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2568,8 +2568,8 @@ namespace isc { namespace dhcp {
 #line 2569 "dhcp4_parser.cc"
     break;
 
-  case 448:
-#line 1535 "dhcp4_parser.yy"
+  case 450:
+#line 1537 "dhcp4_parser.yy"
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2578,16 +2578,16 @@ namespace isc { namespace dhcp {
 #line 2579 "dhcp4_parser.cc"
     break;
 
-  case 458:
-#line 1554 "dhcp4_parser.yy"
+  case 460:
+#line 1556 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2587 "dhcp4_parser.cc"
     break;
 
-  case 459:
-#line 1556 "dhcp4_parser.yy"
+  case 461:
+#line 1558 "dhcp4_parser.yy"
     {
     ElementPtr pool(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
@@ -2596,16 +2596,16 @@ namespace isc { namespace dhcp {
 #line 2597 "dhcp4_parser.cc"
     break;
 
-  case 460:
-#line 1562 "dhcp4_parser.yy"
+  case 462:
+#line 1564 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2605 "dhcp4_parser.cc"
     break;
 
-  case 461:
-#line 1564 "dhcp4_parser.yy"
+  case 463:
+#line 1566 "dhcp4_parser.yy"
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context = yystack_[0].value.as < ElementPtr > ();
@@ -2631,16 +2631,16 @@ namespace isc { namespace dhcp {
 #line 2632 "dhcp4_parser.cc"
     break;
 
-  case 462:
-#line 1587 "dhcp4_parser.yy"
+  case 464:
+#line 1589 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2640 "dhcp4_parser.cc"
     break;
 
-  case 463:
-#line 1589 "dhcp4_parser.yy"
+  case 465:
+#line 1591 "dhcp4_parser.yy"
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location)));
@@ -2668,8 +2668,8 @@ namespace isc { namespace dhcp {
 #line 2669 "dhcp4_parser.cc"
     break;
 
-  case 464:
-#line 1617 "dhcp4_parser.yy"
+  case 466:
+#line 1619 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations", l);
@@ -2679,8 +2679,8 @@ namespace isc { namespace dhcp {
 #line 2680 "dhcp4_parser.cc"
     break;
 
-  case 465:
-#line 1622 "dhcp4_parser.yy"
+  case 467:
+#line 1624 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2688,8 +2688,8 @@ namespace isc { namespace dhcp {
 #line 2689 "dhcp4_parser.cc"
     break;
 
-  case 470:
-#line 1635 "dhcp4_parser.yy"
+  case 472:
+#line 1637 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2698,8 +2698,8 @@ namespace isc { namespace dhcp {
 #line 2699 "dhcp4_parser.cc"
     break;
 
-  case 471:
-#line 1639 "dhcp4_parser.yy"
+  case 473:
+#line 1641 "dhcp4_parser.yy"
     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
@@ -2707,8 +2707,8 @@ namespace isc { namespace dhcp {
 #line 2708 "dhcp4_parser.cc"
     break;
 
-  case 472:
-#line 1644 "dhcp4_parser.yy"
+  case 474:
+#line 1646 "dhcp4_parser.yy"
     {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2717,8 +2717,8 @@ namespace isc { namespace dhcp {
 #line 2718 "dhcp4_parser.cc"
     break;
 
-  case 473:
-#line 1648 "dhcp4_parser.yy"
+  case 475:
+#line 1650 "dhcp4_parser.yy"
     {
     /// @todo: an identifier parameter is required.
     // parsing completed
@@ -2726,16 +2726,16 @@ namespace isc { namespace dhcp {
 #line 2727 "dhcp4_parser.cc"
     break;
 
-  case 493:
-#line 1679 "dhcp4_parser.yy"
+  case 495:
+#line 1681 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2735 "dhcp4_parser.cc"
     break;
 
-  case 494:
-#line 1681 "dhcp4_parser.yy"
+  case 496:
+#line 1683 "dhcp4_parser.yy"
     {
     ElementPtr next_server(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("next-server", next_server);
@@ -2744,16 +2744,16 @@ namespace isc { namespace dhcp {
 #line 2745 "dhcp4_parser.cc"
     break;
 
-  case 495:
-#line 1687 "dhcp4_parser.yy"
+  case 497:
+#line 1689 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2753 "dhcp4_parser.cc"
     break;
 
-  case 496:
-#line 1689 "dhcp4_parser.yy"
+  case 498:
+#line 1691 "dhcp4_parser.yy"
     {
     ElementPtr srv(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-hostname", srv);
@@ -2762,16 +2762,16 @@ namespace isc { namespace dhcp {
 #line 2763 "dhcp4_parser.cc"
     break;
 
-  case 497:
-#line 1695 "dhcp4_parser.yy"
+  case 499:
+#line 1697 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2771 "dhcp4_parser.cc"
     break;
 
-  case 498:
-#line 1697 "dhcp4_parser.yy"
+  case 500:
+#line 1699 "dhcp4_parser.yy"
     {
     ElementPtr bootfile(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("boot-file-name", bootfile);
@@ -2780,16 +2780,16 @@ namespace isc { namespace dhcp {
 #line 2781 "dhcp4_parser.cc"
     break;
 
-  case 499:
-#line 1703 "dhcp4_parser.yy"
+  case 501:
+#line 1705 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2789 "dhcp4_parser.cc"
     break;
 
-  case 500:
-#line 1705 "dhcp4_parser.yy"
+  case 502:
+#line 1707 "dhcp4_parser.yy"
     {
     ElementPtr addr(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", addr);
@@ -2798,8 +2798,8 @@ namespace isc { namespace dhcp {
 #line 2799 "dhcp4_parser.cc"
     break;
 
-  case 501:
-#line 1711 "dhcp4_parser.yy"
+  case 503:
+#line 1713 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-addresses", l);
@@ -2809,8 +2809,8 @@ namespace isc { namespace dhcp {
 #line 2810 "dhcp4_parser.cc"
     break;
 
-  case 502:
-#line 1716 "dhcp4_parser.yy"
+  case 504:
+#line 1718 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2818,16 +2818,16 @@ namespace isc { namespace dhcp {
 #line 2819 "dhcp4_parser.cc"
     break;
 
-  case 503:
-#line 1721 "dhcp4_parser.yy"
+  case 505:
+#line 1723 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2827 "dhcp4_parser.cc"
     break;
 
-  case 504:
-#line 1723 "dhcp4_parser.yy"
+  case 506:
+#line 1725 "dhcp4_parser.yy"
     {
     ElementPtr d(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
@@ -2836,16 +2836,16 @@ namespace isc { namespace dhcp {
 #line 2837 "dhcp4_parser.cc"
     break;
 
-  case 505:
-#line 1729 "dhcp4_parser.yy"
+  case 507:
+#line 1731 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2845 "dhcp4_parser.cc"
     break;
 
-  case 506:
-#line 1731 "dhcp4_parser.yy"
+  case 508:
+#line 1733 "dhcp4_parser.yy"
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hw-address", hw);
@@ -2854,16 +2854,16 @@ namespace isc { namespace dhcp {
 #line 2855 "dhcp4_parser.cc"
     break;
 
-  case 507:
-#line 1737 "dhcp4_parser.yy"
+  case 509:
+#line 1739 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2863 "dhcp4_parser.cc"
     break;
 
-  case 508:
-#line 1739 "dhcp4_parser.yy"
+  case 510:
+#line 1741 "dhcp4_parser.yy"
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-id", hw);
@@ -2872,16 +2872,16 @@ namespace isc { namespace dhcp {
 #line 2873 "dhcp4_parser.cc"
     break;
 
-  case 509:
-#line 1745 "dhcp4_parser.yy"
+  case 511:
+#line 1747 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2881 "dhcp4_parser.cc"
     break;
 
-  case 510:
-#line 1747 "dhcp4_parser.yy"
+  case 512:
+#line 1749 "dhcp4_parser.yy"
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("circuit-id", hw);
@@ -2890,16 +2890,16 @@ namespace isc { namespace dhcp {
 #line 2891 "dhcp4_parser.cc"
     break;
 
-  case 511:
-#line 1753 "dhcp4_parser.yy"
+  case 513:
+#line 1755 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2899 "dhcp4_parser.cc"
     break;
 
-  case 512:
-#line 1755 "dhcp4_parser.yy"
+  case 514:
+#line 1757 "dhcp4_parser.yy"
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flex-id", hw);
@@ -2908,16 +2908,16 @@ namespace isc { namespace dhcp {
 #line 2909 "dhcp4_parser.cc"
     break;
 
-  case 513:
-#line 1761 "dhcp4_parser.yy"
+  case 515:
+#line 1763 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2917 "dhcp4_parser.cc"
     break;
 
-  case 514:
-#line 1763 "dhcp4_parser.yy"
+  case 516:
+#line 1765 "dhcp4_parser.yy"
     {
     ElementPtr host(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
@@ -2926,8 +2926,8 @@ namespace isc { namespace dhcp {
 #line 2927 "dhcp4_parser.cc"
     break;
 
-  case 515:
-#line 1769 "dhcp4_parser.yy"
+  case 517:
+#line 1771 "dhcp4_parser.yy"
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", c);
@@ -2937,8 +2937,8 @@ namespace isc { namespace dhcp {
 #line 2938 "dhcp4_parser.cc"
     break;
 
-  case 516:
-#line 1774 "dhcp4_parser.yy"
+  case 518:
+#line 1776 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2946,8 +2946,8 @@ namespace isc { namespace dhcp {
 #line 2947 "dhcp4_parser.cc"
     break;
 
-  case 517:
-#line 1782 "dhcp4_parser.yy"
+  case 519:
+#line 1784 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay", m);
@@ -2957,8 +2957,8 @@ namespace isc { namespace dhcp {
 #line 2958 "dhcp4_parser.cc"
     break;
 
-  case 518:
-#line 1787 "dhcp4_parser.yy"
+  case 520:
+#line 1789 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2966,8 +2966,8 @@ namespace isc { namespace dhcp {
 #line 2967 "dhcp4_parser.cc"
     break;
 
-  case 521:
-#line 1799 "dhcp4_parser.yy"
+  case 523:
+#line 1801 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", l);
@@ -2977,8 +2977,8 @@ namespace isc { namespace dhcp {
 #line 2978 "dhcp4_parser.cc"
     break;
 
-  case 522:
-#line 1804 "dhcp4_parser.yy"
+  case 524:
+#line 1806 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2986,8 +2986,8 @@ namespace isc { namespace dhcp {
 #line 2987 "dhcp4_parser.cc"
     break;
 
-  case 525:
-#line 1813 "dhcp4_parser.yy"
+  case 527:
+#line 1815 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2996,8 +2996,8 @@ namespace isc { namespace dhcp {
 #line 2997 "dhcp4_parser.cc"
     break;
 
-  case 526:
-#line 1817 "dhcp4_parser.yy"
+  case 528:
+#line 1819 "dhcp4_parser.yy"
     {
     // The name client class parameter is required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -3006,16 +3006,16 @@ namespace isc { namespace dhcp {
 #line 3007 "dhcp4_parser.cc"
     break;
 
-  case 543:
-#line 1846 "dhcp4_parser.yy"
+  case 545:
+#line 1848 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3015 "dhcp4_parser.cc"
     break;
 
-  case 544:
-#line 1848 "dhcp4_parser.yy"
+  case 546:
+#line 1850 "dhcp4_parser.yy"
     {
     ElementPtr test(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
@@ -3024,8 +3024,8 @@ namespace isc { namespace dhcp {
 #line 3025 "dhcp4_parser.cc"
     break;
 
-  case 545:
-#line 1854 "dhcp4_parser.yy"
+  case 547:
+#line 1856 "dhcp4_parser.yy"
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("only-if-required", b);
@@ -3033,8 +3033,8 @@ namespace isc { namespace dhcp {
 #line 3034 "dhcp4_parser.cc"
     break;
 
-  case 546:
-#line 1863 "dhcp4_parser.yy"
+  case 548:
+#line 1865 "dhcp4_parser.yy"
     {
     ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
@@ -3042,8 +3042,8 @@ namespace isc { namespace dhcp {
 #line 3043 "dhcp4_parser.cc"
     break;
 
-  case 547:
-#line 1870 "dhcp4_parser.yy"
+  case 549:
+#line 1872 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("control-socket", m);
@@ -3053,8 +3053,8 @@ namespace isc { namespace dhcp {
 #line 3054 "dhcp4_parser.cc"
     break;
 
-  case 548:
-#line 1875 "dhcp4_parser.yy"
+  case 550:
+#line 1877 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3062,16 +3062,16 @@ namespace isc { namespace dhcp {
 #line 3063 "dhcp4_parser.cc"
     break;
 
-  case 556:
-#line 1891 "dhcp4_parser.yy"
+  case 558:
+#line 1893 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3071 "dhcp4_parser.cc"
     break;
 
-  case 557:
-#line 1893 "dhcp4_parser.yy"
+  case 559:
+#line 1895 "dhcp4_parser.yy"
     {
     ElementPtr stype(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-type", stype);
@@ -3080,16 +3080,16 @@ namespace isc { namespace dhcp {
 #line 3081 "dhcp4_parser.cc"
     break;
 
-  case 558:
-#line 1899 "dhcp4_parser.yy"
+  case 560:
+#line 1901 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3089 "dhcp4_parser.cc"
     break;
 
-  case 559:
-#line 1901 "dhcp4_parser.yy"
+  case 561:
+#line 1903 "dhcp4_parser.yy"
     {
     ElementPtr name(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-name", name);
@@ -3098,16 +3098,16 @@ namespace isc { namespace dhcp {
 #line 3099 "dhcp4_parser.cc"
     break;
 
-  case 560:
-#line 1910 "dhcp4_parser.yy"
+  case 562:
+#line 1912 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3107 "dhcp4_parser.cc"
     break;
 
-  case 561:
-#line 1912 "dhcp4_parser.yy"
+  case 563:
+#line 1914 "dhcp4_parser.yy"
     {
     ElementPtr qc = yystack_[0].value.as < ElementPtr > ();
     ctx.stack_.back()->set("dhcp-queue-control", qc);
@@ -3144,8 +3144,8 @@ namespace isc { namespace dhcp {
 #line 3145 "dhcp4_parser.cc"
     break;
 
-  case 562:
-#line 1948 "dhcp4_parser.yy"
+  case 564:
+#line 1950 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp-ddns", m);
@@ -3155,8 +3155,8 @@ namespace isc { namespace dhcp {
 #line 3156 "dhcp4_parser.cc"
     break;
 
-  case 563:
-#line 1953 "dhcp4_parser.yy"
+  case 565:
+#line 1955 "dhcp4_parser.yy"
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -3166,8 +3166,8 @@ namespace isc { namespace dhcp {
 #line 3167 "dhcp4_parser.cc"
     break;
 
-  case 564:
-#line 1960 "dhcp4_parser.yy"
+  case 566:
+#line 1962 "dhcp4_parser.yy"
     {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3176,8 +3176,8 @@ namespace isc { namespace dhcp {
 #line 3177 "dhcp4_parser.cc"
     break;
 
-  case 565:
-#line 1964 "dhcp4_parser.yy"
+  case 567:
+#line 1966 "dhcp4_parser.yy"
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -3186,8 +3186,8 @@ namespace isc { namespace dhcp {
 #line 3187 "dhcp4_parser.cc"
     break;
 
-  case 586:
-#line 1994 "dhcp4_parser.yy"
+  case 588:
+#line 1996 "dhcp4_parser.yy"
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
@@ -3195,16 +3195,16 @@ namespace isc { namespace dhcp {
 #line 3196 "dhcp4_parser.cc"
     break;
 
-  case 587:
-#line 1999 "dhcp4_parser.yy"
+  case 589:
+#line 2001 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3204 "dhcp4_parser.cc"
     break;
 
-  case 588:
-#line 2001 "dhcp4_parser.yy"
+  case 590:
+#line 2003 "dhcp4_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("qualifying-suffix", s);
@@ -3213,16 +3213,16 @@ namespace isc { namespace dhcp {
 #line 3214 "dhcp4_parser.cc"
     break;
 
-  case 589:
-#line 2007 "dhcp4_parser.yy"
+  case 591:
+#line 2009 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3222 "dhcp4_parser.cc"
     break;
 
-  case 590:
-#line 2009 "dhcp4_parser.yy"
+  case 592:
+#line 2011 "dhcp4_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-ip", s);
@@ -3231,8 +3231,8 @@ namespace isc { namespace dhcp {
 #line 3232 "dhcp4_parser.cc"
     break;
 
-  case 591:
-#line 2015 "dhcp4_parser.yy"
+  case 593:
+#line 2017 "dhcp4_parser.yy"
     {
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
@@ -3240,16 +3240,16 @@ namespace isc { namespace dhcp {
 #line 3241 "dhcp4_parser.cc"
     break;
 
-  case 592:
-#line 2020 "dhcp4_parser.yy"
+  case 594:
+#line 2022 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3249 "dhcp4_parser.cc"
     break;
 
-  case 593:
-#line 2022 "dhcp4_parser.yy"
+  case 595:
+#line 2024 "dhcp4_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-ip", s);
@@ -3258,8 +3258,8 @@ namespace isc { namespace dhcp {
 #line 3259 "dhcp4_parser.cc"
     break;
 
-  case 594:
-#line 2028 "dhcp4_parser.yy"
+  case 596:
+#line 2030 "dhcp4_parser.yy"
     {
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
@@ -3267,8 +3267,8 @@ namespace isc { namespace dhcp {
 #line 3268 "dhcp4_parser.cc"
     break;
 
-  case 595:
-#line 2033 "dhcp4_parser.yy"
+  case 597:
+#line 2035 "dhcp4_parser.yy"
     {
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
@@ -3276,16 +3276,16 @@ namespace isc { namespace dhcp {
 #line 3277 "dhcp4_parser.cc"
     break;
 
-  case 596:
-#line 2038 "dhcp4_parser.yy"
+  case 598:
+#line 2040 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
 #line 3285 "dhcp4_parser.cc"
     break;
 
-  case 597:
-#line 2040 "dhcp4_parser.yy"
+  case 599:
+#line 2042 "dhcp4_parser.yy"
     {
     ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3293,28 +3293,28 @@ namespace isc { namespace dhcp {
 #line 3294 "dhcp4_parser.cc"
     break;
 
-  case 598:
-#line 2046 "dhcp4_parser.yy"
+  case 600:
+#line 2048 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
 #line 3300 "dhcp4_parser.cc"
     break;
 
-  case 599:
-#line 2047 "dhcp4_parser.yy"
+  case 601:
+#line 2049 "dhcp4_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
 #line 3306 "dhcp4_parser.cc"
     break;
 
-  case 600:
-#line 2050 "dhcp4_parser.yy"
+  case 602:
+#line 2052 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
 #line 3314 "dhcp4_parser.cc"
     break;
 
-  case 601:
-#line 2052 "dhcp4_parser.yy"
+  case 603:
+#line 2054 "dhcp4_parser.yy"
     {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
@@ -3323,8 +3323,8 @@ namespace isc { namespace dhcp {
 #line 3324 "dhcp4_parser.cc"
     break;
 
-  case 602:
-#line 2058 "dhcp4_parser.yy"
+  case 604:
+#line 2060 "dhcp4_parser.yy"
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-no-update", b);
@@ -3332,8 +3332,8 @@ namespace isc { namespace dhcp {
 #line 3333 "dhcp4_parser.cc"
     break;
 
-  case 603:
-#line 2063 "dhcp4_parser.yy"
+  case 605:
+#line 2065 "dhcp4_parser.yy"
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-client-update", b);
@@ -3341,16 +3341,16 @@ namespace isc { namespace dhcp {
 #line 3342 "dhcp4_parser.cc"
     break;
 
-  case 604:
-#line 2068 "dhcp4_parser.yy"
+  case 606:
+#line 2070 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
 #line 3350 "dhcp4_parser.cc"
     break;
 
-  case 605:
-#line 2070 "dhcp4_parser.yy"
+  case 607:
+#line 2072 "dhcp4_parser.yy"
     {
     ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3358,40 +3358,40 @@ namespace isc { namespace dhcp {
 #line 3359 "dhcp4_parser.cc"
     break;
 
-  case 606:
-#line 2076 "dhcp4_parser.yy"
+  case 608:
+#line 2078 "dhcp4_parser.yy"
     {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3367 "dhcp4_parser.cc"
     break;
 
-  case 607:
-#line 2079 "dhcp4_parser.yy"
+  case 609:
+#line 2081 "dhcp4_parser.yy"
     {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3375 "dhcp4_parser.cc"
     break;
 
-  case 608:
-#line 2082 "dhcp4_parser.yy"
+  case 610:
+#line 2084 "dhcp4_parser.yy"
     {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3383 "dhcp4_parser.cc"
     break;
 
-  case 609:
-#line 2085 "dhcp4_parser.yy"
+  case 611:
+#line 2087 "dhcp4_parser.yy"
     {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3391 "dhcp4_parser.cc"
     break;
 
-  case 610:
-#line 2088 "dhcp4_parser.yy"
+  case 612:
+#line 2090 "dhcp4_parser.yy"
     {
       error(yystack_[0].location, "boolean values for the replace-client-name are "
                 "no longer supported");
@@ -3399,16 +3399,16 @@ namespace isc { namespace dhcp {
 #line 3400 "dhcp4_parser.cc"
     break;
 
-  case 611:
-#line 2094 "dhcp4_parser.yy"
+  case 613:
+#line 2096 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3408 "dhcp4_parser.cc"
     break;
 
-  case 612:
-#line 2096 "dhcp4_parser.yy"
+  case 614:
+#line 2098 "dhcp4_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("generated-prefix", s);
@@ -3417,16 +3417,16 @@ namespace isc { namespace dhcp {
 #line 3418 "dhcp4_parser.cc"
     break;
 
-  case 613:
-#line 2102 "dhcp4_parser.yy"
+  case 615:
+#line 2104 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3426 "dhcp4_parser.cc"
     break;
 
-  case 614:
-#line 2104 "dhcp4_parser.yy"
+  case 616:
+#line 2106 "dhcp4_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-set", s);
@@ -3435,16 +3435,16 @@ namespace isc { namespace dhcp {
 #line 3436 "dhcp4_parser.cc"
     break;
 
-  case 615:
-#line 2110 "dhcp4_parser.yy"
+  case 617:
+#line 2112 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3444 "dhcp4_parser.cc"
     break;
 
-  case 616:
-#line 2112 "dhcp4_parser.yy"
+  case 618:
+#line 2114 "dhcp4_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-replacement", s);
@@ -3453,16 +3453,16 @@ namespace isc { namespace dhcp {
 #line 3454 "dhcp4_parser.cc"
     break;
 
-  case 617:
-#line 2121 "dhcp4_parser.yy"
+  case 619:
+#line 2123 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3462 "dhcp4_parser.cc"
     break;
 
-  case 618:
-#line 2123 "dhcp4_parser.yy"
+  case 620:
+#line 2125 "dhcp4_parser.yy"
     {
     ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3470,16 +3470,16 @@ namespace isc { namespace dhcp {
 #line 3471 "dhcp4_parser.cc"
     break;
 
-  case 619:
-#line 2128 "dhcp4_parser.yy"
+  case 621:
+#line 2130 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3479 "dhcp4_parser.cc"
     break;
 
-  case 620:
-#line 2130 "dhcp4_parser.yy"
+  case 622:
+#line 2132 "dhcp4_parser.yy"
     {
     ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3487,16 +3487,16 @@ namespace isc { namespace dhcp {
 #line 3488 "dhcp4_parser.cc"
     break;
 
-  case 621:
-#line 2135 "dhcp4_parser.yy"
+  case 623:
+#line 2137 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3496 "dhcp4_parser.cc"
     break;
 
-  case 622:
-#line 2137 "dhcp4_parser.yy"
+  case 624:
+#line 2139 "dhcp4_parser.yy"
     {
     ctx.stack_.back()->set("Control-agent", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3504,8 +3504,8 @@ namespace isc { namespace dhcp {
 #line 3505 "dhcp4_parser.cc"
     break;
 
-  case 623:
-#line 2142 "dhcp4_parser.yy"
+  case 625:
+#line 2144 "dhcp4_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-control", i);
@@ -3515,8 +3515,8 @@ namespace isc { namespace dhcp {
 #line 3516 "dhcp4_parser.cc"
     break;
 
-  case 624:
-#line 2147 "dhcp4_parser.yy"
+  case 626:
+#line 2149 "dhcp4_parser.yy"
     {
     // No config control params are required
     ctx.stack_.pop_back();
@@ -3525,8 +3525,8 @@ namespace isc { namespace dhcp {
 #line 3526 "dhcp4_parser.cc"
     break;
 
-  case 625:
-#line 2153 "dhcp4_parser.yy"
+  case 627:
+#line 2155 "dhcp4_parser.yy"
     {
     // Parse the config-control map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3535,8 +3535,8 @@ namespace isc { namespace dhcp {
 #line 3536 "dhcp4_parser.cc"
     break;
 
-  case 626:
-#line 2157 "dhcp4_parser.yy"
+  case 628:
+#line 2159 "dhcp4_parser.yy"
     {
     // No config_control params are required
     // parsing completed
@@ -3544,8 +3544,8 @@ namespace isc { namespace dhcp {
 #line 3545 "dhcp4_parser.cc"
     break;
 
-  case 631:
-#line 2172 "dhcp4_parser.yy"
+  case 633:
+#line 2174 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-databases", l);
@@ -3555,8 +3555,8 @@ namespace isc { namespace dhcp {
 #line 3556 "dhcp4_parser.cc"
     break;
 
-  case 632:
-#line 2177 "dhcp4_parser.yy"
+  case 634:
+#line 2179 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3564,8 +3564,8 @@ namespace isc { namespace dhcp {
 #line 3565 "dhcp4_parser.cc"
     break;
 
-  case 633:
-#line 2182 "dhcp4_parser.yy"
+  case 635:
+#line 2184 "dhcp4_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-fetch-wait-time", value);
@@ -3573,8 +3573,8 @@ namespace isc { namespace dhcp {
 #line 3574 "dhcp4_parser.cc"
     break;
 
-  case 634:
-#line 2192 "dhcp4_parser.yy"
+  case 636:
+#line 2194 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("Logging", m);
@@ -3584,8 +3584,8 @@ namespace isc { namespace dhcp {
 #line 3585 "dhcp4_parser.cc"
     break;
 
-  case 635:
-#line 2197 "dhcp4_parser.yy"
+  case 637:
+#line 2199 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3593,8 +3593,8 @@ namespace isc { namespace dhcp {
 #line 3594 "dhcp4_parser.cc"
     break;
 
-  case 636:
-#line 2202 "dhcp4_parser.yy"
+  case 638:
+#line 2204 "dhcp4_parser.yy"
     {
     // Parse the Logging map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3603,16 +3603,16 @@ namespace isc { namespace dhcp {
 #line 3604 "dhcp4_parser.cc"
     break;
 
-  case 637:
-#line 2206 "dhcp4_parser.yy"
+  case 639:
+#line 2208 "dhcp4_parser.yy"
     {
     // parsing completed
 }
 #line 3612 "dhcp4_parser.cc"
     break;
 
-  case 641:
-#line 2222 "dhcp4_parser.yy"
+  case 643:
+#line 2224 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("loggers", l);
@@ -3622,8 +3622,8 @@ namespace isc { namespace dhcp {
 #line 3623 "dhcp4_parser.cc"
     break;
 
-  case 642:
-#line 2227 "dhcp4_parser.yy"
+  case 644:
+#line 2229 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3631,8 +3631,8 @@ namespace isc { namespace dhcp {
 #line 3632 "dhcp4_parser.cc"
     break;
 
-  case 645:
-#line 2239 "dhcp4_parser.yy"
+  case 647:
+#line 2241 "dhcp4_parser.yy"
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
@@ -3641,16 +3641,16 @@ namespace isc { namespace dhcp {
 #line 3642 "dhcp4_parser.cc"
     break;
 
-  case 646:
-#line 2243 "dhcp4_parser.yy"
+  case 648:
+#line 2245 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
 }
 #line 3650 "dhcp4_parser.cc"
     break;
 
-  case 656:
-#line 2260 "dhcp4_parser.yy"
+  case 658:
+#line 2262 "dhcp4_parser.yy"
     {
     ElementPtr dl(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
@@ -3658,16 +3658,16 @@ namespace isc { namespace dhcp {
 #line 3659 "dhcp4_parser.cc"
     break;
 
-  case 657:
-#line 2265 "dhcp4_parser.yy"
+  case 659:
+#line 2267 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3667 "dhcp4_parser.cc"
     break;
 
-  case 658:
-#line 2267 "dhcp4_parser.yy"
+  case 660:
+#line 2269 "dhcp4_parser.yy"
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
@@ -3676,8 +3676,8 @@ namespace isc { namespace dhcp {
 #line 3677 "dhcp4_parser.cc"
     break;
 
-  case 659:
-#line 2273 "dhcp4_parser.yy"
+  case 661:
+#line 2275 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
@@ -3687,8 +3687,8 @@ namespace isc { namespace dhcp {
 #line 3688 "dhcp4_parser.cc"
     break;
 
-  case 660:
-#line 2278 "dhcp4_parser.yy"
+  case 662:
+#line 2280 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3696,8 +3696,8 @@ namespace isc { namespace dhcp {
 #line 3697 "dhcp4_parser.cc"
     break;
 
-  case 663:
-#line 2287 "dhcp4_parser.yy"
+  case 665:
+#line 2289 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3706,24 +3706,24 @@ namespace isc { namespace dhcp {
 #line 3707 "dhcp4_parser.cc"
     break;
 
-  case 664:
-#line 2291 "dhcp4_parser.yy"
+  case 666:
+#line 2293 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
 }
 #line 3715 "dhcp4_parser.cc"
     break;
 
-  case 671:
-#line 2305 "dhcp4_parser.yy"
+  case 673:
+#line 2307 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3723 "dhcp4_parser.cc"
     break;
 
-  case 672:
-#line 2307 "dhcp4_parser.yy"
+  case 674:
+#line 2309 "dhcp4_parser.yy"
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
@@ -3732,8 +3732,8 @@ namespace isc { namespace dhcp {
 #line 3733 "dhcp4_parser.cc"
     break;
 
-  case 673:
-#line 2313 "dhcp4_parser.yy"
+  case 675:
+#line 2315 "dhcp4_parser.yy"
     {
     ElementPtr flush(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
@@ -3741,8 +3741,8 @@ namespace isc { namespace dhcp {
 #line 3742 "dhcp4_parser.cc"
     break;
 
-  case 674:
-#line 2318 "dhcp4_parser.yy"
+  case 676:
+#line 2320 "dhcp4_parser.yy"
     {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
@@ -3750,8 +3750,8 @@ namespace isc { namespace dhcp {
 #line 3751 "dhcp4_parser.cc"
     break;
 
-  case 675:
-#line 2323 "dhcp4_parser.yy"
+  case 677:
+#line 2325 "dhcp4_parser.yy"
     {
     ElementPtr maxver(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
@@ -4031,122 +4031,122 @@ namespace isc { namespace dhcp {
   }
 
 
-  const short Dhcp4Parser::yypact_ninf_ = -847;
+  const short Dhcp4Parser::yypact_ninf_ = -837;
 
   const signed char Dhcp4Parser::yytable_ninf_ = -1;
 
   const short
   Dhcp4Parser::yypact_[] =
   {
-     325,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,    32,    22,    33,    40,    44,
-      73,    95,   104,   108,   115,   121,   125,   135,   151,   158,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,    22,  -103,
-       6,   145,    59,   272,    41,    15,    79,   237,   177,   -35,
-     468,    51,    26,  -847,   206,   210,   221,   219,   228,  -847,
-    -847,  -847,  -847,  -847,   231,  -847,    56,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,   252,   285,   286,  -847,
-    -847,  -847,  -847,  -847,  -847,   299,   300,   302,   303,   306,
-     309,   316,   319,   322,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,   323,  -847,  -847,
-    -847,  -847,  -847,    58,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,   332,  -847,   105,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,   340,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,   106,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,   128,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-     330,   342,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,   354,  -847,  -847,   359,  -847,  -847,
-    -847,   362,  -847,  -847,   357,   371,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,   374,
-     382,  -847,  -847,  -847,  -847,   368,   389,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,   138,
-    -847,  -847,  -847,   394,  -847,  -847,   397,  -847,   399,   400,
-    -847,  -847,   403,   404,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,   142,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,   149,  -847,
-    -847,  -847,   408,   186,  -847,  -847,  -847,  -847,    22,    22,
-    -847,   242,   414,   422,   423,   424,   438,  -847,     6,  -847,
-     440,   446,   448,   217,   277,   283,   456,   460,   463,   464,
-     471,   472,   304,   305,   307,   308,   324,   301,   333,   336,
-     335,   476,   495,   508,   509,   510,   513,   514,   515,   516,
-     517,   518,   519,   520,   351,   522,   523,   526,   528,   145,
-    -847,   530,   531,   533,   365,    59,  -847,   540,   541,   542,
-     543,   544,   545,   376,   550,   551,   552,   272,  -847,   553,
-      41,  -847,   554,   555,   558,   559,   560,   561,   562,   563,
-    -847,    15,  -847,   565,   567,   398,   569,   570,   571,   401,
-    -847,   237,   572,   405,   406,  -847,   177,   574,   575,   -23,
-    -847,   407,   576,   580,   411,   583,   415,   416,   587,   589,
-     431,   432,   605,   606,   607,   608,   468,  -847,    51,  -847,
-     611,   442,    26,  -847,  -847,  -847,   615,   614,   616,    22,
-      22,    22,  -847,   617,   618,   619,  -847,  -847,  -847,   449,
-     454,   455,   622,   623,   626,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,   459,   628,   629,   630,   631,   632,
-     465,   331,   635,   637,   638,   639,   640,  -847,   641,   632,
-     642,   645,  -847,   646,    78,   146,  -847,  -847,   473,   479,
-     480,   649,   482,   483,  -847,   646,   484,   651,  -847,   486,
-    -847,   646,   487,   488,   489,   490,   491,   492,   493,  -847,
-     494,   496,  -847,   497,   498,   499,  -847,  -847,   500,  -847,
-    -847,  -847,   501,    22,  -847,  -847,   502,   503,  -847,   504,
-    -847,  -847,    30,   505,  -847,  -847,   -37,   506,   507,   511,
-    -847,  -847,   663,  -847,  -847,    22,   145,    51,  -847,  -847,
-    -847,    26,    59,   613,  -847,  -847,  -847,   233,   233,   671,
-    -847,   674,   675,   676,   678,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,   116,   679,   680,   681,    68,    70,  -847,
-     468,   682,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,   683,  -847,  -847,  -847,  -847,    82,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,   671,  -847,   220,   230,   234,   238,  -847,   256,
-    -847,  -847,  -847,  -847,  -847,  -847,   687,   688,   689,   690,
-     691,  -847,  -847,  -847,  -847,   692,   693,   694,   695,   696,
-    -847,   260,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,   289,  -847,   697,   698,  -847,  -847,   699,   701,
-    -847,  -847,   700,   704,  -847,  -847,   702,   706,  -847,  -847,
-     705,   707,  -847,  -847,  -847,  -847,  -847,  -847,    76,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,   218,  -847,  -847,   708,
-     709,  -847,  -847,   710,   712,  -847,   713,   714,   715,   716,
-     717,   718,   311,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,   334,  -847,  -847,  -847,   343,
-    -847,   241,  -847,   529,  -847,   719,   720,  -847,  -847,  -847,
-    -847,   721,   722,  -847,  -847,  -847,  -847,   723,   613,  -847,
-     726,   727,   728,   729,   539,   548,   564,   566,   573,   730,
-     731,   732,   733,   577,   578,   579,   581,   568,   233,  -847,
-    -847,   233,  -847,   671,   272,  -847,   674,   237,  -847,   675,
-     177,  -847,   676,   444,  -847,   678,   116,  -847,    63,   679,
-    -847,    15,  -847,   680,   -35,  -847,   681,   582,   584,   585,
-     586,   588,   590,    68,  -847,   735,   736,    70,  -847,  -847,
-     -22,   682,  -847,  -847,   737,   738,    41,  -847,   683,   741,
-    -847,  -847,   592,  -847,   402,   593,   594,   595,  -847,  -847,
-    -847,  -847,  -847,   596,   597,   598,   599,  -847,  -847,  -847,
-    -847,  -847,  -847,   344,  -847,   345,  -847,   740,  -847,   742,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,   361,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-     745,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-     746,   743,  -847,  -847,  -847,  -847,  -847,   749,  -847,   372,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,   600,   601,
-    -847,  -847,   757,  -847,  -847,  -847,  -847,  -847,   379,  -847,
-    -847,  -847,  -847,  -847,  -847,   602,   381,  -847,   646,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,   444,  -847,   759,   603,
-    -847,    63,  -847,  -847,  -847,  -847,   772,   604,   773,   -22,
-    -847,  -847,  -847,  -847,  -847,   609,  -847,  -847,   775,  -847,
-     610,  -847,  -847,   774,  -847,  -847,   254,  -847,   141,   774,
-    -847,  -847,   781,   782,   785,   387,  -847,  -847,  -847,  -847,
-    -847,  -847,   787,   621,   625,   633,   141,  -847,   652,  -847,
-    -847,  -847,  -847,  -847
+     318,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,    50,    21,    74,    86,    90,
+     108,   119,   136,   147,   165,   182,   223,   224,   225,   237,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,    21,     5,
+      17,   154,    29,    60,    67,   233,   183,    26,   270,   -49,
+     515,   111,    58,  -837,   259,   263,   276,   274,   288,  -837,
+    -837,  -837,  -837,  -837,   291,  -837,    44,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,   301,   309,   315,  -837,
+    -837,  -837,  -837,  -837,  -837,   317,   319,   325,   326,   328,
+     329,   336,   344,   345,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,   346,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,    88,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,   354,  -837,    91,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,   356,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,   104,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,   122,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,   284,   366,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,   286,  -837,
+    -837,   369,  -837,  -837,  -837,   371,  -837,  -837,   314,   367,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,   372,   373,  -837,  -837,  -837,  -837,   370,
+     376,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,   168,  -837,  -837,  -837,   377,  -837,  -837,
+     380,  -837,   384,   387,  -837,  -837,   388,   389,  -837,  -837,
+    -837,  -837,  -837,   185,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+     218,  -837,  -837,  -837,   390,   239,  -837,  -837,  -837,  -837,
+      21,    21,  -837,   207,   392,   395,   397,   403,   404,  -837,
+      17,  -837,   405,   407,   408,   243,   244,   245,   409,   411,
+     419,   425,   434,   437,   268,   285,   287,   296,   297,   282,
+     299,   316,   331,   440,   441,   458,   468,   469,   471,   488,
+     489,   498,   499,   502,   503,   504,   337,   508,   509,   510,
+     511,   512,   513,   154,  -837,   514,   516,   517,   343,    29,
+    -837,   520,   522,   524,   525,   526,   527,   358,   529,   531,
+     532,    60,  -837,   535,    67,  -837,   536,   538,   539,   542,
+     543,   544,   545,   546,  -837,   233,  -837,   547,   549,   381,
+     550,   552,   553,   382,  -837,    26,   555,   386,   391,  -837,
+     270,   556,   559,    -3,  -837,   393,   560,   561,   394,   562,
+     399,   400,   567,   572,   401,   410,   575,   576,   515,  -837,
+     111,  -837,   577,   413,    58,  -837,  -837,  -837,   579,   578,
+     581,    21,    21,    21,  -837,   582,   583,   584,  -837,  -837,
+    -837,   420,   421,   423,   590,   591,   587,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,   429,   599,   600,   601,
+     602,   603,   435,   271,   604,   607,   608,   609,   610,  -837,
+     611,   603,   613,   442,   443,   617,  -837,   649,   144,   184,
+    -837,  -837,   482,   483,   485,   654,   490,   491,  -837,   649,
+     492,   655,  -837,   493,  -837,   649,   494,   495,   496,   497,
+     500,   501,   505,  -837,   506,   507,  -837,   518,   519,   521,
+    -837,  -837,   523,  -837,  -837,  -837,   528,    21,  -837,  -837,
+     530,   533,  -837,   534,  -837,  -837,    14,   444,  -837,  -837,
+      65,   537,  -837,  -837,   666,  -837,  -837,    21,   154,   111,
+    -837,  -837,  -837,    58,    29,   648,  -837,  -837,  -837,   585,
+     585,   668,  -837,   669,   670,   674,   675,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,    31,   676,   677,   678,   171,
+      18,  -837,   515,  -837,  -837,   679,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,   680,  -837,  -837,
+    -837,  -837,   114,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,   668,  -837,   242,   248,   249,   252,
+    -837,   265,  -837,  -837,  -837,  -837,  -837,  -837,   685,   686,
+     689,   691,   693,  -837,  -837,  -837,  -837,   694,   695,   696,
+     698,   700,  -837,   269,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,   273,  -837,   699,   705,  -837,  -837,
+     703,   708,  -837,  -837,   706,   710,  -837,  -837,   709,   711,
+    -837,  -837,   712,   713,  -837,  -837,  -837,  -837,  -837,  -837,
+      77,  -837,  -837,  -837,  -837,  -837,  -837,  -837,   133,  -837,
+    -837,   714,   716,  -837,  -837,   715,   719,  -837,   720,   721,
+     722,   723,   724,   725,   290,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,   298,  -837,  -837,
+    -837,   300,  -837,   152,  -837,   557,  -837,   717,   728,  -837,
+    -837,  -837,  -837,   726,   727,  -837,  -837,  -837,  -837,   731,
+     648,  -837,   732,   733,   734,   735,   558,   541,   566,   565,
+     568,   739,   740,   741,   742,   573,   574,   580,   586,   588,
+     585,  -837,  -837,   585,  -837,   668,    60,  -837,   669,    26,
+    -837,   670,   270,  -837,   674,   438,  -837,   675,    31,  -837,
+     199,   676,  -837,   233,  -837,   677,   -49,  -837,   678,   589,
+     592,   593,   594,   595,   596,   171,  -837,   745,   746,    18,
+    -837,  -837,    85,   679,  -837,  -837,   747,   748,    67,  -837,
+     680,   751,  -837,  -837,   598,  -837,   330,   605,   606,   612,
+    -837,  -837,  -837,  -837,  -837,   614,   615,   618,   620,  -837,
+    -837,  -837,  -837,  -837,  -837,   304,  -837,   306,  -837,   744,
+    -837,   749,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+     308,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,   752,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,   753,   756,  -837,  -837,  -837,  -837,  -837,   754,
+    -837,   312,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+     621,   626,  -837,  -837,   761,  -837,  -837,  -837,  -837,  -837,
+     323,  -837,  -837,  -837,  -837,  -837,  -837,   635,   348,  -837,
+     649,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,   438,  -837,
+     768,   597,  -837,   199,  -837,  -837,  -837,  -837,   770,   640,
+     771,    85,  -837,  -837,  -837,  -837,  -837,   636,  -837,  -837,
+     772,  -837,   643,  -837,  -837,   769,  -837,  -837,   195,  -837,
+     -77,   769,  -837,  -837,   776,   777,   778,   349,  -837,  -837,
+    -837,  -837,  -837,  -837,   779,   657,   651,   662,   -77,  -837,
+     671,  -837,  -837,  -837,  -837,  -837
   };
 
   const unsigned short
@@ -4156,155 +4156,155 @@ 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,   139,     9,   282,    11,
-     447,    13,   472,    15,   372,    17,   380,    19,   417,    21,
-     247,    23,   564,    25,   636,    27,   625,    29,    47,    41,
-       0,     0,     0,     0,     0,   474,     0,   382,   419,     0,
+      35,    36,    58,     5,    70,     7,   141,     9,   284,    11,
+     449,    13,   474,    15,   374,    17,   382,    19,   419,    21,
+     249,    23,   566,    25,   638,    27,   627,    29,    47,    41,
+       0,     0,     0,     0,     0,   476,     0,   384,   421,     0,
        0,     0,     0,    49,     0,    48,     0,     0,    42,    68,
-     634,   617,   619,   621,     0,    67,     0,    60,    62,    64,
-      65,    66,    63,   623,   128,   154,     0,     0,     0,   493,
-     495,   497,   152,   161,   163,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   123,   274,   370,   409,   336,   460,
-     462,   329,   225,   521,   464,   239,   258,     0,   547,   560,
-     562,   641,   113,     0,    72,    74,    75,    76,    77,    78,
-     109,   110,   111,    79,   107,    96,    97,    98,    82,    83,
-     104,    84,    85,    86,    90,    91,    80,   108,    81,    88,
-      89,   102,   103,   105,    99,   100,   101,    87,    92,    93,
-      94,    95,   106,   112,   141,   143,   147,     0,   138,     0,
-     130,   132,   133,   134,   135,   136,   137,   317,   319,   321,
-     439,   315,   323,     0,   327,   325,   517,   314,   286,   287,
-     288,   289,   290,   311,   312,   313,   301,   302,     0,   284,
-     293,   306,   307,   308,   294,   296,   297,   299,   295,   291,
-     292,   309,   310,   298,   303,   304,   305,   300,   458,   457,
-     453,   454,   452,     0,   449,   451,   455,   456,   515,   503,
-     505,   509,   507,   513,   511,   499,   492,   486,   490,   491,
-       0,   475,   476,   487,   488,   489,   483,   478,   484,   480,
-     481,   482,   485,   479,     0,   399,   206,     0,   403,   401,
-     406,     0,   395,   396,     0,   383,   384,   386,   398,   387,
-     388,   389,   405,   390,   391,   392,   393,   394,   433,     0,
-       0,   431,   432,   435,   436,     0,   420,   421,   423,   424,
-     425,   426,   427,   428,   429,   430,   254,   256,   251,     0,
-     249,   252,   253,     0,   587,   589,     0,   592,     0,     0,
-     596,   600,     0,     0,   604,   611,   613,   615,   585,   583,
-     584,     0,   566,   568,   569,   570,   571,   572,   573,   574,
-     575,   576,   577,   578,   579,   580,   581,   582,     0,   638,
-     640,   631,     0,     0,   627,   629,   630,    46,     0,     0,
-      39,     0,     0,     0,     0,     0,     0,    57,     0,    59,
+     636,   619,   621,   623,     0,    67,     0,    60,    62,    64,
+      65,    66,    63,   625,   130,   156,     0,     0,     0,   495,
+     497,   499,   154,   163,   165,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   125,   276,   372,   411,   338,   462,
+     464,   331,   227,   523,   466,   241,   260,     0,   549,   562,
+     564,   615,   617,   643,   115,     0,    72,    74,    75,    76,
+      77,    78,   109,   110,   111,    79,   107,    96,    97,    98,
+      82,    83,   104,    84,    85,    86,    90,    91,    80,   108,
+      81,    88,    89,   102,   103,   105,    99,   100,   101,    87,
+      92,    93,    94,    95,   113,   114,   106,   112,   143,   145,
+     149,     0,   140,     0,   132,   134,   135,   136,   137,   138,
+     139,   319,   321,   323,   441,   317,   325,     0,   329,   327,
+     519,   316,   288,   289,   290,   291,   292,   313,   314,   315,
+     303,   304,     0,   286,   295,   308,   309,   310,   296,   298,
+     299,   301,   297,   293,   294,   311,   312,   300,   305,   306,
+     307,   302,   460,   459,   455,   456,   454,     0,   451,   453,
+     457,   458,   517,   505,   507,   511,   509,   515,   513,   501,
+     494,   488,   492,   493,     0,   477,   478,   489,   490,   491,
+     485,   480,   486,   482,   483,   484,   487,   481,     0,   401,
+     208,     0,   405,   403,   408,     0,   397,   398,     0,   385,
+     386,   388,   400,   389,   390,   391,   407,   392,   393,   394,
+     395,   396,   435,     0,     0,   433,   434,   437,   438,     0,
+     422,   423,   425,   426,   427,   428,   429,   430,   431,   432,
+     256,   258,   253,     0,   251,   254,   255,     0,   589,   591,
+       0,   594,     0,     0,   598,   602,     0,     0,   606,   613,
+     587,   585,   586,     0,   568,   570,   571,   572,   573,   574,
+     575,   576,   577,   578,   579,   580,   581,   582,   583,   584,
+       0,   640,   642,   633,     0,     0,   629,   631,   632,    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,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    71,     0,     0,     0,     0,     0,
+     142,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   285,     0,     0,   450,     0,     0,     0,     0,
+       0,     0,     0,     0,   475,     0,   375,     0,     0,     0,
+       0,     0,     0,     0,   383,     0,     0,     0,     0,   420,
+       0,     0,     0,     0,   250,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   567,
+       0,   639,     0,     0,     0,   628,    50,    43,     0,     0,
+       0,     0,     0,     0,    61,     0,     0,     0,   127,   128,
+     129,     0,     0,     0,     0,     0,     0,   116,   117,   118,
+     119,   120,   121,   122,   123,   124,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   548,
+       0,     0,     0,     0,     0,     0,    73,     0,     0,     0,
+     153,   133,     0,     0,     0,     0,     0,     0,   337,     0,
+       0,     0,   287,     0,   452,     0,     0,     0,     0,     0,
+       0,     0,     0,   479,     0,     0,   399,     0,     0,     0,
+     410,   387,     0,   439,   440,   424,     0,     0,   252,   588,
+       0,     0,   593,     0,   596,   597,     0,     0,   604,   605,
+       0,     0,   569,   641,     0,   635,   630,     0,     0,     0,
+     620,   622,   624,     0,     0,     0,   496,   498,   500,     0,
+       0,   167,   126,   278,   376,   413,   340,    40,   463,   465,
+     333,   334,   335,   336,   332,     0,     0,   468,   243,     0,
+       0,   563,     0,   616,   618,     0,    51,   144,   147,   148,
+     146,   151,   152,   150,   320,   322,   324,   443,   318,   326,
+     330,   328,     0,   461,   518,   506,   508,   512,   510,   516,
+     514,   502,   402,   209,   406,   404,   409,   436,   257,   259,
+     590,   592,   595,   600,   601,   599,   603,   608,   609,   610,
+     611,   612,   607,   614,   167,    44,     0,     0,     0,     0,
+     161,     0,   158,   160,   195,   201,   203,   205,     0,     0,
+       0,     0,     0,   217,   219,   221,   223,     0,     0,     0,
+       0,     0,   194,     0,   173,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   188,   189,   190,   185,   191,
+     192,   193,   186,   187,     0,   171,     0,   168,   169,   282,
+       0,   279,   280,   380,     0,   377,   378,   417,     0,   414,
+     415,   344,     0,   341,   342,   236,   237,   238,   239,   240,
+       0,   229,   231,   232,   233,   234,   235,   527,     0,   525,
+     472,     0,   469,   470,   247,     0,   244,   245,     0,     0,
+       0,     0,     0,     0,     0,   262,   264,   265,   266,   267,
+     268,   269,   558,   560,   557,   555,   556,     0,   551,   553,
+     554,     0,   647,     0,   645,    53,   447,     0,   444,   445,
+     503,   521,   522,     0,     0,    69,   637,   626,   131,     0,
+       0,   157,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      71,     0,     0,     0,     0,     0,   140,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   283,     0,
-       0,   448,     0,     0,     0,     0,     0,     0,     0,     0,
-     473,     0,   373,     0,     0,     0,     0,     0,     0,     0,
-     381,     0,     0,     0,     0,   418,     0,     0,     0,     0,
-     248,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   565,     0,   637,
-       0,     0,     0,   626,    50,    43,     0,     0,     0,     0,
-       0,     0,    61,     0,     0,     0,   125,   126,   127,     0,
-       0,     0,     0,     0,     0,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   546,     0,     0,
-       0,     0,    73,     0,     0,     0,   151,   131,     0,     0,
-       0,     0,     0,     0,   335,     0,     0,     0,   285,     0,
-     450,     0,     0,     0,     0,     0,     0,     0,     0,   477,
-       0,     0,   397,     0,     0,     0,   408,   385,     0,   437,
-     438,   422,     0,     0,   250,   586,     0,     0,   591,     0,
-     594,   595,     0,     0,   602,   603,     0,     0,     0,     0,
-     567,   639,     0,   633,   628,     0,     0,     0,   618,   620,
-     622,     0,     0,     0,   494,   496,   498,     0,     0,   165,
-     124,   276,   374,   411,   338,    40,   461,   463,   331,   332,
-     333,   334,   330,     0,     0,   466,   241,     0,     0,   561,
-       0,     0,    51,   142,   145,   146,   144,   149,   150,   148,
-     318,   320,   322,   441,   316,   324,   328,   326,     0,   459,
-     516,   504,   506,   510,   508,   514,   512,   500,   400,   207,
-     404,   402,   407,   434,   255,   257,   588,   590,   593,   598,
-     599,   597,   601,   606,   607,   608,   609,   610,   605,   612,
-     614,   616,   165,    44,     0,     0,     0,     0,   159,     0,
-     156,   158,   193,   199,   201,   203,     0,     0,     0,     0,
-       0,   215,   217,   219,   221,     0,     0,     0,     0,     0,
-     192,     0,   171,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   186,   187,   188,   183,   189,   190,   191,
-     184,   185,     0,   169,     0,   166,   167,   280,     0,   277,
-     278,   378,     0,   375,   376,   415,     0,   412,   413,   342,
-       0,   339,   340,   234,   235,   236,   237,   238,     0,   227,
-     229,   230,   231,   232,   233,   525,     0,   523,   470,     0,
-     467,   468,   245,     0,   242,   243,     0,     0,     0,     0,
-       0,     0,     0,   260,   262,   263,   264,   265,   266,   267,
-     556,   558,   555,   553,   554,     0,   549,   551,   552,     0,
-     645,     0,   643,    53,   445,     0,   442,   443,   501,   519,
-     520,     0,     0,    69,   635,   624,   129,     0,     0,   155,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   153,
-     162,     0,   164,     0,     0,   275,     0,   382,   371,     0,
-     419,   410,     0,     0,   337,     0,     0,   226,   527,     0,
-     522,   474,   465,     0,     0,   240,     0,     0,     0,     0,
-       0,     0,     0,     0,   259,     0,     0,     0,   548,   563,
-       0,     0,   642,    55,     0,    54,     0,   440,     0,     0,
-     518,   632,     0,   157,     0,     0,     0,     0,   205,   208,
-     209,   210,   211,     0,     0,     0,     0,   223,   224,   212,
-     213,   214,   172,     0,   168,     0,   279,     0,   377,     0,
-     414,   369,   361,   362,   363,   349,   350,   366,   367,   368,
-     352,   353,   346,   347,   348,   359,   360,   358,     0,   344,
-     351,   364,   365,   354,   355,   356,   357,   341,   228,   543,
-       0,   541,   542,   534,   535,   539,   540,   536,   537,   538,
-       0,   528,   529,   531,   532,   533,   524,     0,   469,     0,
-     244,   268,   269,   270,   271,   272,   273,   261,     0,     0,
-     550,   659,     0,   657,   655,   649,   653,   654,     0,   647,
-     651,   652,   650,   644,    52,     0,     0,   444,     0,   160,
-     195,   196,   197,   198,   194,   200,   202,   204,   216,   218,
-     220,   222,   170,   281,   379,   416,     0,   343,     0,     0,
-     526,     0,   471,   246,   557,   559,     0,     0,     0,     0,
-     646,    56,   446,   502,   345,     0,   545,   530,     0,   656,
-       0,   648,   544,     0,   658,   663,     0,   661,     0,     0,
-     660,   671,     0,     0,     0,     0,   665,   667,   668,   669,
-     670,   662,     0,     0,     0,     0,     0,   664,     0,   673,
-     674,   675,   666,   672
+       0,   155,   164,     0,   166,     0,     0,   277,     0,   384,
+     373,     0,   421,   412,     0,     0,   339,     0,     0,   228,
+     529,     0,   524,   476,   467,     0,     0,   242,     0,     0,
+       0,     0,     0,     0,     0,     0,   261,     0,     0,     0,
+     550,   565,     0,     0,   644,    55,     0,    54,     0,   442,
+       0,     0,   520,   634,     0,   159,     0,     0,     0,     0,
+     207,   210,   211,   212,   213,     0,     0,     0,     0,   225,
+     226,   214,   215,   216,   174,     0,   170,     0,   281,     0,
+     379,     0,   416,   371,   363,   364,   365,   351,   352,   368,
+     369,   370,   354,   355,   348,   349,   350,   361,   362,   360,
+       0,   346,   353,   366,   367,   356,   357,   358,   359,   343,
+     230,   545,     0,   543,   544,   536,   537,   541,   542,   538,
+     539,   540,     0,   530,   531,   533,   534,   535,   526,     0,
+     471,     0,   246,   270,   271,   272,   273,   274,   275,   263,
+       0,     0,   552,   661,     0,   659,   657,   651,   655,   656,
+       0,   649,   653,   654,   652,   646,    52,     0,     0,   446,
+       0,   162,   197,   198,   199,   200,   196,   202,   204,   206,
+     218,   220,   222,   224,   172,   283,   381,   418,     0,   345,
+       0,     0,   528,     0,   473,   248,   559,   561,     0,     0,
+       0,     0,   648,    56,   448,   504,   347,     0,   547,   532,
+       0,   658,     0,   650,   546,     0,   660,   665,     0,   663,
+       0,     0,   662,   673,     0,     0,     0,     0,   667,   669,
+     670,   671,   672,   664,     0,     0,     0,     0,     0,   666,
+       0,   675,   676,   677,   668,   674
   };
 
   const short
   Dhcp4Parser::yypgoto_[] =
   {
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,   -44,  -847,  -483,  -847,
-     187,  -847,  -847,  -847,  -847,  -847,  -847,  -525,  -847,  -847,
-    -847,   -70,  -847,  -847,  -847,   417,  -847,  -847,  -847,  -847,
-     200,   373,   -54,   -24,    -5,    -4,    -1,    11,    14,    17,
-    -847,  -847,  -847,  -847,    21,    25,  -847,  -847,   198,   388,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,   -16,  -847,  -847,  -847,
-    -847,  -847,  -847,   123,  -847,   -31,  -847,  -603,   -30,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,   -36,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,   -33,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,   -47,  -847,  -847,  -847,   -38,   378,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,   -42,  -847,  -847,  -847,  -847,  -847,
-    -847,  -846,  -847,  -847,  -847,   -14,  -847,  -847,  -847,    -9,
-     420,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -845,
-    -847,    23,  -847,    29,  -847,    28,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,     7,  -847,  -847,  -143,   -65,  -847,  -847,
-    -847,  -847,  -847,    31,  -847,  -847,  -847,    36,  -847,   426,
-    -847,   -72,  -847,  -847,  -847,  -847,  -847,   -64,  -847,  -847,
-    -847,  -847,  -847,   -40,  -847,  -847,  -847,    27,  -847,  -847,
-    -847,    34,  -847,   419,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,    -3,  -847,  -847,  -847,     0,
-     457,  -847,  -847,   -52,  -847,   -20,  -847,   -60,  -847,  -847,
-    -847,    35,  -847,  -847,  -847,    38,  -847,   447,    -8,  -847,
-      -2,  -847,    10,  -847,   243,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -826,  -847,  -847,  -847,  -847,  -847,    37,  -847,
-    -847,  -847,  -132,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,    13,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,   262,   418,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-    -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,  -847,
-     292,   413,  -847,  -847,  -847,  -847,  -847,  -847,  -847,   310,
-     425,   -69,  -847,  -847,    16,  -847,  -847,  -129,  -847,  -847,
-    -847,  -847,  -847,  -847,  -148,  -847,  -847,  -164,  -847,  -847,
-    -847,  -847,  -847
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,   -46,  -837,  -466,  -837,
+     311,  -837,  -837,  -837,  -837,  -837,  -837,  -534,  -837,  -837,
+    -837,   -70,  -837,  -837,  -837,   459,  -837,  -837,  -837,  -837,
+     176,   422,   -55,   -54,   -27,   -24,    -9,     6,     9,    11,
+    -837,  -837,  -837,  -837,    12,    19,  -837,  -837,   228,   432,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,    52,  -837,  -837,  -837,
+    -837,  -837,  -837,   186,  -837,    28,  -837,  -607,    35,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,   -35,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,    20,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,     8,  -837,  -837,  -837,    13,   417,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,     7,  -837,  -837,  -837,  -837,  -837,
+    -837,  -836,  -837,  -837,  -837,    36,  -837,  -837,  -837,    39,
+     455,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -828,
+    -837,   -17,  -837,    -5,  -837,    22,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,    30,  -837,  -837,  -130,   -65,  -837,  -837,
+    -837,  -837,  -837,    38,  -837,  -837,  -837,    41,  -837,   436,
+    -837,   -72,  -837,  -837,  -837,  -837,  -837,   -66,  -837,  -837,
+    -837,  -837,  -837,    -7,  -837,  -837,  -837,    40,  -837,  -837,
+    -837,    43,  -837,   433,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,     2,  -837,  -837,  -837,    10,
+     462,  -837,  -837,   -39,  -837,   -19,  -837,   -59,  -837,  -837,
+    -837,    32,  -837,  -837,  -837,    37,  -837,   454,   -58,  -837,
+     -52,  -837,    -1,  -837,   250,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -825,  -837,  -837,  -837,  -837,  -837,    42,  -837,
+    -837,  -837,  -122,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,    25,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,   275,   427,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,   -64,  -837,   -60,  -837,
+    -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,  -837,
+     303,   424,  -837,  -837,  -837,  -837,  -837,  -837,  -837,   310,
+     430,   -57,  -837,  -837,    33,  -837,  -837,  -120,  -837,  -837,
+    -837,  -837,  -837,  -837,  -139,  -837,  -837,  -155,  -837,  -837,
+    -837,  -837,  -837
   };
 
   const short
@@ -4312,265 +4312,265 @@ namespace isc { namespace dhcp {
   {
       -1,    15,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    38,    39,    40,    69,
-     626,    87,    88,    41,    68,    84,    85,   643,   813,   894,
-     895,   720,    43,    70,    96,    97,    98,   372,    45,    71,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   401,   155,   156,   157,   158,   381,   189,   190,
-      47,    72,   191,   421,   192,   422,   646,   193,   423,   649,
-     194,   159,   389,   160,   382,   699,   700,   701,   827,   161,
-     390,   162,   391,   744,   745,   746,   851,   721,   722,   723,
-     830,  1014,   724,   831,   725,   832,   726,   833,   727,   728,
-     454,   729,   730,   731,   732,   733,   734,   735,   736,   839,
-     737,   840,   738,   841,   739,   842,   740,   741,   163,   409,
-     768,   769,   770,   771,   772,   773,   774,   164,   412,   783,
-     784,   785,   874,    61,    79,   319,   320,   321,   467,   322,
-     468,   165,   413,   792,   793,   794,   795,   796,   797,   798,
-     799,   166,   402,   748,   749,   750,   854,    49,    73,   218,
-     219,   220,   431,   221,   427,   222,   428,   223,   429,   224,
-     432,   225,   435,   226,   434,   167,   408,   632,   228,   168,
-     405,   760,   761,   762,   863,   948,   949,   169,   403,    55,
-      76,   752,   753,   754,   857,    57,    77,   284,   285,   286,
-     287,   288,   289,   290,   453,   291,   457,   292,   456,   293,
-     294,   458,   295,   170,   404,   756,   757,   758,   860,    59,
-      78,   305,   306,   307,   308,   309,   462,   310,   311,   312,
-     313,   230,   430,   815,   816,   817,   896,    51,    74,   243,
-     244,   245,   439,   171,   406,   172,   407,   173,   411,   779,
-     780,   781,   871,    53,    75,   260,   261,   262,   174,   386,
-     175,   387,   176,   388,   266,   449,   820,   899,   267,   443,
-     268,   444,   269,   446,   270,   445,   271,   448,   272,   447,
-     273,   442,   237,   436,   821,   177,   410,   776,   777,   868,
-     970,   971,   972,   973,   974,  1028,   975,   178,   179,   415,
-     805,   806,   807,   885,   808,   886,   180,   416,   181,   417,
-      63,    80,   341,   342,   343,   344,   472,   345,   473,   346,
-     347,   475,   348,   349,   350,   478,   681,   351,   479,   352,
-     353,   354,   482,   688,   355,   483,   356,   484,   357,   485,
-      99,   374,   100,   375,   101,   376,   182,   380,    67,    82,
-     363,   364,   365,   490,   366,   102,   373,    65,    81,   358,
-     359,   183,   418,   811,   812,   890,   998,   999,  1000,  1001,
-    1038,  1002,  1036,  1056,  1057,  1058,  1065,  1066,  1067,  1072,
-    1068,  1069,  1070
+     628,    87,    88,    41,    68,    84,    85,   647,   815,   896,
+     897,   722,    43,    70,    96,    97,    98,   374,    45,    71,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   403,   157,   158,   159,   160,   383,   193,   194,
+      47,    72,   195,   425,   196,   426,   650,   197,   427,   653,
+     198,   161,   391,   162,   384,   701,   702,   703,   829,   163,
+     392,   164,   393,   746,   747,   748,   853,   723,   724,   725,
+     832,  1016,   726,   833,   727,   834,   728,   835,   729,   730,
+     458,   731,   732,   733,   734,   735,   736,   737,   738,   841,
+     739,   842,   740,   843,   741,   844,   742,   743,   165,   411,
+     770,   771,   772,   773,   774,   775,   776,   166,   414,   785,
+     786,   787,   876,    61,    79,   323,   324,   325,   471,   326,
+     472,   167,   415,   794,   795,   796,   797,   798,   799,   800,
+     801,   168,   404,   750,   751,   752,   856,    49,    73,   222,
+     223,   224,   435,   225,   431,   226,   432,   227,   433,   228,
+     436,   229,   439,   230,   438,   169,   410,   634,   232,   170,
+     407,   762,   763,   764,   865,   950,   951,   171,   405,    55,
+      76,   754,   755,   756,   859,    57,    77,   288,   289,   290,
+     291,   292,   293,   294,   457,   295,   461,   296,   460,   297,
+     298,   462,   299,   172,   406,   758,   759,   760,   862,    59,
+      78,   309,   310,   311,   312,   313,   466,   314,   315,   316,
+     317,   234,   434,   817,   818,   819,   898,    51,    74,   247,
+     248,   249,   443,   173,   408,   174,   409,   175,   413,   781,
+     782,   783,   873,    53,    75,   264,   265,   266,   176,   388,
+     177,   389,   178,   390,   270,   453,   822,   901,   271,   447,
+     272,   448,   273,   450,   274,   449,   275,   452,   276,   451,
+     277,   446,   241,   440,   823,   179,   412,   778,   779,   870,
+     972,   973,   974,   975,   976,  1030,   977,   180,   181,   417,
+     807,   808,   809,   887,   810,   888,   182,   418,   183,   419,
+      63,    80,   343,   344,   345,   346,   476,   347,   477,   348,
+     349,   479,   350,   351,   352,   482,   685,   353,   483,   354,
+     355,   356,   486,   692,   357,   487,   184,   420,   185,   421,
+      99,   376,   100,   377,   101,   378,   186,   382,    67,    82,
+     365,   366,   367,   492,   368,   102,   375,    65,    81,   360,
+     361,   187,   422,   813,   814,   892,  1000,  1001,  1002,  1003,
+    1040,  1004,  1038,  1058,  1059,  1060,  1067,  1068,  1069,  1074,
+    1070,  1071,  1072
   };
 
   const unsigned short
   Dhcp4Parser::yytable_[] =
   {
-      95,   142,   188,   207,   239,   256,   303,   282,   301,   318,
-     338,   274,   360,   233,   304,   742,    89,   943,   944,   208,
-     195,   231,   246,   258,    83,   296,   314,    31,   339,    32,
-     656,    33,    30,   229,   242,   257,   660,   956,   361,   362,
-      42,   283,   302,   109,   110,   111,   625,    44,   679,   209,
-     276,    46,   196,   232,   247,   259,   625,   297,   315,   378,
-     340,   419,   129,   130,   379,   234,   420,   263,   210,   211,
-      86,   235,   212,   264,   184,   185,   316,   317,   186,   866,
-      48,   187,   867,   236,   213,   265,   127,   214,   316,   317,
-     215,   109,   110,   111,   216,   644,   645,   240,   217,   129,
-     130,   227,    50,   241,   683,   684,   685,   686,   425,   437,
-     248,    52,   127,   426,   438,    54,   249,   250,   251,   252,
-     253,   254,    56,   255,   238,   129,   130,   991,    58,   992,
-     993,   440,    60,   126,   127,   276,   441,   204,    94,   687,
-     205,   469,    62,   129,   130,   486,   470,   129,   130,   126,
-     487,    94,   488,    90,   129,   130,   103,   489,    64,   104,
-     959,   960,    91,    92,    93,    66,   647,   648,   105,   680,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,    94,
-     943,   944,   786,   787,   788,   789,   790,   791,    94,   492,
-     255,   818,   800,   801,   493,    34,    35,    36,    37,   141,
-     956,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   367,   368,    94,   126,   127,   763,   764,   765,
-     766,   869,   767,   419,   870,   369,   128,   370,   823,   129,
-     130,   371,    94,   488,   131,   377,    94,   492,   824,   132,
-     133,   425,   825,    94,   891,   134,   826,   892,   923,   276,
-     298,   277,   278,   299,   300,   135,   383,  1059,   136,   828,
-    1060,   129,   130,   848,   829,   137,   138,   702,   849,   139,
-     140,   275,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   712,   713,   714,   715,   716,   717,   718,   719,   384,
-     385,  1061,   848,   141,  1062,  1063,  1064,   850,   107,   108,
-     109,   110,   111,   392,   393,   276,   394,   395,    95,   276,
-     396,   277,   278,   397,   883,   279,   280,   281,    94,   884,
-     398,   129,   130,   399,   494,   495,   400,   414,   115,   116,
-     117,   118,   119,   120,   121,   122,   424,   887,   450,   197,
-     198,   199,   888,   127,   433,   451,   486,   848,   437,   142,
-      94,   889,  1022,  1023,   200,   188,   129,   130,   201,   202,
-     203,   131,   452,   455,  1026,   460,   459,   207,   204,  1027,
-     239,   205,   134,   195,   461,   469,   465,   233,   463,   206,
-    1033,   256,  1039,   208,   440,   231,   464,  1040,   246,  1042,
-    1076,   282,   466,   506,   303,  1077,   301,   229,   471,   258,
-     242,   474,   304,   476,   477,   196,    94,   480,   481,   296,
-      94,   257,   491,   209,   314,   496,   338,   232,   497,   360,
-     247,   628,   629,   630,   631,   283,   498,   499,   500,   234,
-     302,   259,   210,   211,   339,   235,   212,  1010,  1011,  1012,
-    1013,   297,   501,   263,   503,    94,   315,   236,   213,   264,
-     504,   214,   505,   507,   215,   608,   609,   610,   216,   508,
-     509,   265,   217,   240,   510,   227,   340,   511,   512,   241,
-     107,   108,   109,   110,   111,   513,   514,   520,   515,   516,
-     524,   517,   518,  1043,     1,     2,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,   519,   525,
-     115,   116,   117,   118,   119,   120,   121,   122,   521,   523,
-     125,   522,   526,   527,   528,   127,   276,   529,   530,   531,
-     532,   533,   534,   535,   536,   537,   538,   539,   129,   130,
-     540,   202,   541,   131,   543,   544,   142,   545,   360,   675,
-     204,   546,   188,   205,   548,   549,   550,   551,   552,   553,
-     554,   206,   129,   130,   555,   556,   557,   559,   561,   562,
-     195,   693,   563,   564,   565,   566,   567,   568,   802,   570,
-     338,   571,   572,   573,   574,   575,   578,   576,   582,   583,
-     586,   579,   580,   585,   587,   588,   803,   589,   339,   590,
-     591,   592,   196,   593,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   594,   595,   596,
-     597,   598,   599,   336,   337,   602,   603,    94,   804,   605,
-     340,   606,   614,   607,   611,   612,   613,   615,   616,   617,
-     618,   619,   620,   621,   622,   623,   624,   698,   627,    32,
-     633,    94,   634,   635,   636,   682,   650,   637,   638,   640,
-     641,   642,   651,   652,   653,   654,   655,   657,   658,   659,
-     661,   662,   663,   664,   665,   666,   667,   668,   692,   669,
-     670,   671,   672,   673,   674,   676,   677,   678,   743,   689,
-     690,   747,   751,   755,   691,   759,   775,   778,   782,   810,
-     814,   834,   835,   836,   837,   838,   843,   844,   845,   846,
-     847,   853,   893,   852,   856,   855,   858,   859,   861,   862,
-     865,   864,   873,   908,   872,   876,   875,   877,   878,   879,
-     880,   881,   882,   898,   909,   897,   639,   902,   901,   900,
-     904,   905,   906,   907,   913,   914,   915,   916,   910,   988,
-     989,  1005,   911,  1004,   921,  1008,  1031,   912,  1024,  1029,
-    1025,   917,   918,   919,  1030,   920,   981,  1032,   982,   983,
-     984,  1037,   985,  1045,   986,  1009,  1015,  1016,  1017,  1018,
-    1019,  1020,  1021,  1034,  1035,  1041,  1048,  1050,  1049,  1046,
-    1053,  1055,  1052,  1054,   207,  1073,  1074,   282,   303,  1075,
-     301,  1078,   542,   931,   233,   502,   304,  1079,   961,  1080,
-     208,   256,   231,   963,   318,   296,   694,  1081,   314,   932,
-     697,   951,   903,   547,   229,   822,   965,   802,   922,   258,
-     994,   283,   924,   950,   302,  1083,   239,   942,   964,   980,
-     209,   257,   962,   958,   232,   803,   979,   297,   996,   933,
-     315,   987,   926,   952,   246,   925,   234,   584,   966,   210,
-     211,   259,   235,   212,   995,   953,   242,   558,   934,   935,
-     967,   954,   936,   263,   236,   213,   968,   804,   214,   264,
-     997,   215,   957,   955,   937,   216,   247,   938,   969,   217,
-     939,   265,   227,  1044,   940,   581,   945,   577,   941,   930,
-     928,   947,   946,   927,   929,  1007,  1006,   560,   569,  1047,
-     990,   819,   809,   696,   600,   604,   976,  1003,   978,   977,
-    1051,  1071,  1082,   601,     0,     0,     0,   695,     0,   240,
-       0,     0,     0,     0,     0,   241,     0,     0,     0,     0,
+      95,   144,   192,   211,   243,   260,   307,   286,   305,   322,
+     340,   278,   308,   744,   237,   238,   358,   267,   212,   213,
+     359,   239,    83,   268,   362,   660,    31,    89,    32,   945,
+      33,   664,   683,   199,   235,   250,   262,   946,   300,   318,
+     958,   341,   287,   306,   188,   189,   214,   380,   190,   215,
+      30,   191,   381,   200,   236,   251,   263,   244,   301,   319,
+     279,   342,   320,   321,   216,   627,   233,   246,   261,   245,
+     363,   364,   240,  1063,   269,   627,  1064,  1065,  1066,   217,
+     868,    42,   218,   869,   219,   220,   107,   108,   109,   110,
+     111,   423,   221,    44,   429,   231,   424,    46,   280,   430,
+     281,   282,   129,   130,   283,   284,   285,   441,   320,   321,
+     129,   130,   442,   129,   130,    48,   115,   116,   117,   118,
+     119,   120,   121,   122,    94,   444,    50,   201,   202,   203,
+     445,   127,   765,   766,   767,   768,   871,   769,   127,   872,
+     802,   803,   204,    52,   129,   130,   205,   206,   207,   131,
+     242,   129,   130,   684,    54,   893,   208,   280,   894,   209,
+     134,   648,   649,   208,    90,   103,   209,   210,   104,   129,
+     130,   473,    56,    91,    92,    93,   474,   105,    86,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   488,    58,
+      94,    94,   945,   489,    34,    35,    36,    37,  1061,    94,
+     946,  1062,    94,   958,   651,   652,   687,   688,   689,   690,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   490,   259,   820,   126,   127,   491,   109,   110,   111,
+      60,    62,    64,    94,   993,   128,   994,   995,   129,   130,
+      94,   691,   494,   131,    66,   423,   925,   495,   132,   133,
+     825,   490,   494,   126,   134,   429,   826,   827,    94,   143,
+     828,   109,   110,   111,   135,   369,   370,   136,   830,   126,
+     127,   280,   850,   831,   137,   138,   850,   851,   139,   140,
+     371,   852,   372,   129,   130,   788,   789,   790,   791,   792,
+     793,   373,   454,   885,   456,   379,   961,   962,   886,   141,
+     142,   889,   143,   488,   127,   385,   890,   850,   891,   441,
+      95,  1028,  1024,   386,  1025,   473,  1029,   129,   130,   387,
+    1035,   394,   464,   395,   496,   497,  1041,    94,   252,   396,
+     397,  1042,   398,   399,   253,   254,   255,   256,   257,   258,
+     400,   259,   280,   302,   281,   282,   303,   304,   401,   402,
+     416,   444,  1078,   144,   129,   130,  1044,  1079,   428,   192,
+     437,   630,   631,   632,   633,  1012,  1013,  1014,  1015,   455,
+     465,   211,    94,   459,   243,   463,   467,   468,   469,   470,
+     498,   475,   237,   238,   478,   260,   212,   213,   480,   239,
+     199,   481,   484,   485,   493,   286,   499,   267,   307,   500,
+     305,   501,   235,   268,   308,   250,    94,   502,   503,   505,
+     200,   506,   507,   511,   214,   512,   262,   215,   340,   508,
+     509,   510,   236,   513,   358,   251,   300,   244,   359,   514,
+     287,   318,   216,   362,   233,   306,   263,   246,   515,   245,
+     240,   516,   517,    94,   526,   527,   301,   217,   261,   341,
+     218,   319,   219,   220,   269,   610,   611,   612,   522,   518,
+     221,   519,   528,   231,   107,   108,   109,   110,   111,   342,
+     520,   521,   529,   530,   523,   531,  1045,     1,     2,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,   524,   532,   533,   115,   116,   117,   118,   119,   120,
+     121,   122,   534,   535,   125,   525,   536,   537,   538,   127,
+     280,   539,   540,   541,   542,   543,   544,   545,   547,   550,
+     548,   549,   129,   130,   552,   206,   553,   131,   554,   555,
+     556,   557,   558,   559,   208,   560,   561,   209,   144,   563,
+     565,   679,   566,   567,   192,   210,   568,   569,   570,   571,
+     572,   574,   362,   575,   577,   576,   578,   579,   580,   582,
+     586,   695,   583,   587,   590,   591,   593,   584,   592,   589,
+     804,   596,   340,   594,   595,   199,   597,   598,   358,   600,
+     601,   604,   359,   607,   686,   608,   599,   605,   609,   613,
+     614,   615,   621,   616,   617,   200,   618,   619,   620,   129,
+     130,   805,   622,   341,   623,   624,   625,   626,   629,   635,
+      32,    94,   636,   637,   638,   643,   644,   639,   640,   704,
+     642,   806,   645,   342,   705,   706,   707,   708,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+     721,   327,   328,   329,   330,   331,   332,   333,   334,   335,
+     336,   337,   338,   339,   646,   654,   655,   280,   656,   657,
+     141,   142,   662,   658,   659,   661,   663,   665,   666,   667,
+     668,   694,   700,   669,   670,   745,   749,   753,   671,   672,
+     673,   757,   761,   777,   780,   784,   812,   816,    94,   836,
+     837,   674,   675,   838,   676,   839,   677,   840,   845,   846,
+     847,   678,   848,   680,   849,   854,   681,   682,   855,   857,
+     693,   858,   860,   861,   864,   863,   867,   911,   866,   875,
+     874,   877,   878,   899,   879,   880,   881,   882,   883,   884,
+     895,   900,   910,   903,   902,   904,   906,   907,   908,   909,
+     912,   913,   914,   915,   916,   917,   918,   919,   920,   990,
+     991,  1007,  1026,  1006,   921,  1010,  1031,  1027,    94,  1033,
+     922,  1032,  1034,   983,   923,  1039,   984,   985,   986,   987,
+     988,  1011,  1047,  1048,  1050,  1052,  1057,  1055,  1017,  1018,
+    1075,  1076,  1077,  1080,   696,  1019,   211,  1020,  1021,   286,
+     307,  1022,   305,  1023,  1036,   933,   308,   237,   238,  1037,
+     963,   212,   213,   260,   239,   965,   322,   955,  1043,  1054,
+     934,   935,   969,   956,  1051,   267,  1056,   235,   970,   804,
+     300,   268,   996,   318,   287,  1082,   953,   306,   243,   214,
+     944,   967,   215,  1081,   262,   964,  1083,   236,   936,   504,
+     301,   937,   699,   319,  1085,   546,   954,   216,   947,   233,
+     805,   968,   641,   998,   263,   240,   938,   997,   952,   250,
+     948,   551,   217,   966,   957,   218,   261,   219,   220,   971,
+     806,   939,   269,   999,   940,   221,   941,   942,   231,   251,
+     824,   244,   905,   926,   943,   924,   982,   949,   960,   981,
+     588,   246,   989,   245,   928,   927,   562,   959,  1046,   930,
+     929,   581,  1009,   585,   932,   931,   564,   980,  1008,   573,
+     979,  1049,   821,   978,   992,   602,   698,   811,   606,   697,
+     603,  1053,  1073,  1084,     0,     0,  1005,     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,   931,     0,     0,     0,
-       0,   961,     0,     0,     0,     0,   963,     0,     0,   994,
-       0,     0,   932,     0,   951,     0,     0,     0,     0,   965,
-       0,     0,     0,     0,     0,     0,   950,   996,     0,     0,
-     942,   964,     0,     0,     0,   962,     0,     0,     0,     0,
-       0,     0,   933,   995,     0,     0,   952,     0,     0,     0,
-       0,   966,     0,     0,     0,     0,     0,     0,   953,   997,
-       0,   934,   935,   967,   954,   936,     0,     0,     0,   968,
-       0,     0,     0,     0,     0,     0,   955,   937,     0,     0,
-     938,   969,     0,   939,     0,     0,     0,   940,     0,   945,
-       0,   941,     0,     0,   947,   946
+       0,     0,     0,     0,     0,     0,     0,     0,   933,     0,
+       0,     0,     0,   963,     0,     0,     0,     0,   965,     0,
+     955,   996,     0,   934,   935,   969,   956,     0,     0,     0,
+       0,   970,     0,     0,     0,     0,     0,     0,     0,   953,
+       0,     0,     0,   944,   967,     0,     0,     0,   964,     0,
+       0,   936,   998,     0,   937,     0,   997,     0,     0,   954,
+       0,   947,     0,     0,   968,     0,     0,     0,     0,   938,
+       0,   952,   999,   948,     0,     0,   966,   957,     0,     0,
+       0,     0,   971,     0,   939,     0,     0,   940,     0,   941,
+     942,     0,     0,     0,     0,     0,     0,   943,     0,     0,
+     949
   };
 
   const short
   Dhcp4Parser::yycheck_[] =
   {
       70,    71,    72,    73,    74,    75,    78,    77,    78,    79,
-      80,    76,    81,    73,    78,   618,    10,   863,   863,    73,
-      72,    73,    74,    75,    68,    77,    78,     5,    80,     7,
-     555,     9,     0,    73,    74,    75,   561,   863,    12,    13,
-       7,    77,    78,    28,    29,    30,   529,     7,    18,    73,
-      72,     7,    72,    73,    74,    75,   539,    77,    78,     3,
-      80,     3,    84,    85,     8,    73,     8,    75,    73,    73,
-     173,    73,    73,    75,    15,    16,   111,   112,    19,     3,
-       7,    22,     6,    73,    73,    75,    71,    73,   111,   112,
-      73,    28,    29,    30,    73,    17,    18,    74,    73,    84,
-      85,    73,     7,    74,   141,   142,   143,   144,     3,     3,
-      95,     7,    71,     8,     8,     7,   101,   102,   103,   104,
-     105,   106,     7,   108,    83,    84,    85,   149,     7,   151,
-     152,     3,     7,    70,    71,    72,     8,    96,   173,   176,
-      99,     3,     7,    84,    85,     3,     8,    84,    85,    70,
-       8,   173,     3,   147,    84,    85,    11,     8,     7,    14,
-      97,    98,   156,   157,   158,     7,    20,    21,    23,   139,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,   173,
-    1026,  1026,   114,   115,   116,   117,   118,   119,   173,     3,
-     108,   109,   122,   123,     8,   173,   174,   175,   176,   148,
-    1026,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,     6,     3,   173,    70,    71,   101,   102,   103,
-     104,     3,   106,     3,     6,     4,    81,     8,     8,    84,
-      85,     3,   173,     3,    89,     4,   173,     3,     8,    94,
-      95,     3,     8,   173,     3,   100,     8,     6,   851,    72,
-      73,    74,    75,    76,    77,   110,     4,     3,   113,     3,
-       6,    84,    85,     3,     8,   120,   121,    34,     8,   124,
-     125,    34,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,     4,
-       4,   150,     3,   148,   153,   154,   155,     8,    26,    27,
-      28,    29,    30,     4,     4,    72,     4,     4,   378,    72,
-       4,    74,    75,     4,     3,    78,    79,    80,   173,     8,
-       4,    84,    85,     4,   368,   369,     4,     4,    56,    57,
-      58,    59,    60,    61,    62,    63,     4,     3,     8,    67,
-      68,    69,     8,    71,     4,     3,     3,     3,     3,   419,
-     173,     8,     8,     8,    82,   425,    84,    85,    86,    87,
-      88,    89,     8,     4,     3,     8,     4,   437,    96,     8,
-     440,    99,   100,   425,     3,     3,     8,   437,     4,   107,
-       8,   451,     3,   437,     3,   437,     4,     8,   440,     8,
-       3,   461,     3,   176,   466,     8,   466,   437,     4,   451,
-     440,     4,   466,     4,     4,   425,   173,     4,     4,   461,
-     173,   451,     4,   437,   466,   173,   486,   437,     4,   488,
-     440,    90,    91,    92,    93,   461,     4,     4,     4,   437,
-     466,   451,   437,   437,   486,   437,   437,    35,    36,    37,
-      38,   461,     4,   451,     4,   173,   466,   437,   437,   451,
-       4,   437,     4,   176,   437,   499,   500,   501,   437,   176,
-       4,   451,   437,   440,     4,   437,   486,     4,     4,   440,
-      26,    27,    28,    29,    30,     4,     4,   176,   174,   174,
-       4,   174,   174,  1008,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   174,     4,
-      56,    57,    58,    59,    60,    61,    62,    63,   175,   174,
-      66,   175,     4,     4,     4,    71,    72,     4,     4,     4,
-       4,     4,     4,     4,     4,   174,     4,     4,    84,    85,
-       4,    87,     4,    89,     4,     4,   606,     4,   607,   583,
-      96,   176,   612,    99,     4,     4,     4,     4,     4,     4,
-     174,   107,    84,    85,     4,     4,     4,     4,     4,     4,
-     612,   605,     4,     4,     4,     4,     4,     4,   638,     4,
-     640,     4,   174,     4,     4,     4,     4,   176,     4,     4,
-       4,   176,   176,   176,     4,   174,   638,     4,   640,   174,
-     174,     4,   612,     4,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   176,   176,     4,
-       4,     4,     4,   145,   146,     4,   174,   173,   638,     4,
-     640,     7,   173,     7,     7,     7,     7,   173,   173,     7,
-       7,     5,   173,     5,     5,     5,     5,    24,   173,     7,
-       5,   173,     5,     5,     5,   140,   173,     7,     7,     7,
-       5,     5,   173,   173,     5,   173,   173,   173,     7,   173,
-     173,   173,   173,   173,   173,   173,   173,   173,     5,   173,
-     173,   173,   173,   173,   173,   173,   173,   173,     7,   173,
-     173,     7,     7,     7,   173,     7,     7,     7,     7,     7,
-       7,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     3,   173,     6,     3,     6,     6,     3,     6,     3,
-       3,     6,     3,   174,     6,     3,     6,     4,     4,     4,
-       4,     4,     4,     3,   176,     6,   539,     4,     6,     8,
-       4,     4,     4,     4,     4,     4,     4,     4,   174,     4,
-       4,     3,   176,     6,   176,     4,     3,   174,     8,     4,
-       8,   174,   174,   174,     8,   174,   174,     8,   174,   174,
-     174,     4,   174,     4,   174,   173,   173,   173,   173,   173,
-     173,   173,   173,   173,   173,   173,     4,     4,   174,   176,
-       5,     7,   173,   173,   854,     4,     4,   857,   860,     4,
-     860,     4,   419,   863,   854,   378,   860,   176,   868,   174,
-     854,   871,   854,   868,   874,   857,   606,   174,   860,   863,
-     612,   863,   828,   425,   854,   692,   868,   887,   848,   871,
-     890,   857,   853,   863,   860,   173,   896,   863,   868,   876,
-     854,   871,   868,   866,   854,   887,   874,   857,   890,   863,
-     860,   883,   856,   863,   896,   854,   854,   469,   868,   854,
-     854,   871,   854,   854,   890,   863,   896,   437,   863,   863,
-     868,   863,   863,   871,   854,   854,   868,   887,   854,   871,
-     890,   854,   865,   863,   863,   854,   896,   863,   868,   854,
-     863,   871,   854,  1026,   863,   466,   863,   461,   863,   862,
-     859,   863,   863,   857,   860,   898,   896,   440,   451,  1031,
-     887,   658,   640,   611,   486,   492,   869,   891,   873,   871,
-    1039,  1059,  1076,   488,    -1,    -1,    -1,   607,    -1,   896,
-      -1,    -1,    -1,    -1,    -1,   896,    -1,    -1,    -1,    -1,
+      80,    76,    78,   620,    73,    73,    80,    75,    73,    73,
+      80,    73,    68,    75,    81,   559,     5,    10,     7,   865,
+       9,   565,    18,    72,    73,    74,    75,   865,    77,    78,
+     865,    80,    77,    78,    15,    16,    73,     3,    19,    73,
+       0,    22,     8,    72,    73,    74,    75,    74,    77,    78,
+      34,    80,   111,   112,    73,   531,    73,    74,    75,    74,
+      12,    13,    73,   150,    75,   541,   153,   154,   155,    73,
+       3,     7,    73,     6,    73,    73,    26,    27,    28,    29,
+      30,     3,    73,     7,     3,    73,     8,     7,    72,     8,
+      74,    75,    84,    85,    78,    79,    80,     3,   111,   112,
+      84,    85,     8,    84,    85,     7,    56,    57,    58,    59,
+      60,    61,    62,    63,   173,     3,     7,    67,    68,    69,
+       8,    71,   101,   102,   103,   104,     3,   106,    71,     6,
+     122,   123,    82,     7,    84,    85,    86,    87,    88,    89,
+      83,    84,    85,   139,     7,     3,    96,    72,     6,    99,
+     100,    17,    18,    96,   147,    11,    99,   107,    14,    84,
+      85,     3,     7,   156,   157,   158,     8,    23,   173,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,     3,     7,
+     173,   173,  1028,     8,   173,   174,   175,   176,     3,   173,
+    1028,     6,   173,  1028,    20,    21,   141,   142,   143,   144,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,     3,   108,   109,    70,    71,     8,    28,    29,    30,
+       7,     7,     7,   173,   149,    81,   151,   152,    84,    85,
+     173,   176,     3,    89,     7,     3,   853,     8,    94,    95,
+       8,     3,     3,    70,   100,     3,     8,     8,   173,   148,
+       8,    28,    29,    30,   110,     6,     3,   113,     3,    70,
+      71,    72,     3,     8,   120,   121,     3,     8,   124,   125,
+       4,     8,     8,    84,    85,   114,   115,   116,   117,   118,
+     119,     3,     8,     3,     8,     4,    97,    98,     8,   145,
+     146,     3,   148,     3,    71,     4,     8,     3,     8,     3,
+     380,     3,     8,     4,     8,     3,     8,    84,    85,     4,
+       8,     4,     8,     4,   370,   371,     3,   173,    95,     4,
+       4,     8,     4,     4,   101,   102,   103,   104,   105,   106,
+       4,   108,    72,    73,    74,    75,    76,    77,     4,     4,
+       4,     3,     3,   423,    84,    85,     8,     8,     4,   429,
+       4,    90,    91,    92,    93,    35,    36,    37,    38,     3,
+       3,   441,   173,     4,   444,     4,     4,     4,     8,     3,
+     173,     4,   441,   441,     4,   455,   441,   441,     4,   441,
+     429,     4,     4,     4,     4,   465,     4,   455,   470,     4,
+     470,     4,   441,   455,   470,   444,   173,     4,     4,     4,
+     429,     4,     4,     4,   441,     4,   455,   441,   488,   176,
+     176,   176,   441,     4,   488,   444,   465,   444,   488,     4,
+     465,   470,   441,   490,   441,   470,   455,   444,     4,   444,
+     441,     4,   174,   173,     4,     4,   465,   441,   455,   488,
+     441,   470,   441,   441,   455,   501,   502,   503,   176,   174,
+     441,   174,     4,   441,    26,    27,    28,    29,    30,   488,
+     174,   174,     4,     4,   175,     4,  1010,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+     172,   175,     4,     4,    56,    57,    58,    59,    60,    61,
+      62,    63,     4,     4,    66,   174,     4,     4,     4,    71,
+      72,   174,     4,     4,     4,     4,     4,     4,     4,   176,
+       4,     4,    84,    85,     4,    87,     4,    89,     4,     4,
+       4,     4,   174,     4,    96,     4,     4,    99,   608,     4,
+       4,   587,     4,     4,   614,   107,     4,     4,     4,     4,
+       4,     4,   609,     4,     4,   174,     4,     4,   176,     4,
+       4,   607,   176,     4,     4,     4,     4,   176,   174,   176,
+     640,     4,   642,   174,   174,   614,     4,   176,   642,     4,
+       4,     4,   642,     4,   140,     7,   176,   174,     7,     7,
+       7,     7,     5,   173,   173,   614,   173,     7,     7,    84,
+      85,   640,   173,   642,     5,     5,     5,     5,   173,     5,
+       7,   173,     5,     5,     5,   173,   173,     7,     7,    34,
+       7,   640,     5,   642,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,     5,   173,   173,    72,   173,     5,
+     145,   146,     7,   173,   173,   173,   173,   173,   173,   173,
+     173,     5,    24,   173,   173,     7,     7,     7,   173,   173,
+     173,     7,     7,     7,     7,     7,     7,     7,   173,     4,
+       4,   173,   173,     4,   173,     4,   173,     4,     4,     4,
+       4,   173,     4,   173,     4,     6,   173,   173,     3,     6,
+     173,     3,     6,     3,     3,     6,     3,   176,     6,     3,
+       6,     6,     3,     6,     4,     4,     4,     4,     4,     4,
+     173,     3,   174,     6,     8,     4,     4,     4,     4,     4,
+     174,   176,   174,     4,     4,     4,     4,   174,   174,     4,
+       4,     3,     8,     6,   174,     4,     4,     8,   173,     3,
+     174,     8,     8,   174,   176,     4,   174,   174,   174,   174,
+     174,   173,     4,   176,     4,     4,     7,     5,   173,   173,
+       4,     4,     4,     4,   608,   173,   856,   173,   173,   859,
+     862,   173,   862,   173,   173,   865,   862,   856,   856,   173,
+     870,   856,   856,   873,   856,   870,   876,   865,   173,   173,
+     865,   865,   870,   865,   174,   873,   173,   856,   870,   889,
+     859,   873,   892,   862,   859,   174,   865,   862,   898,   856,
+     865,   870,   856,   176,   873,   870,   174,   856,   865,   380,
+     859,   865,   614,   862,   173,   423,   865,   856,   865,   856,
+     889,   870,   541,   892,   873,   856,   865,   892,   865,   898,
+     865,   429,   856,   870,   865,   856,   873,   856,   856,   870,
+     889,   865,   873,   892,   865,   856,   865,   865,   856,   898,
+     694,   898,   830,   855,   865,   850,   878,   865,   868,   876,
+     473,   898,   885,   898,   858,   856,   441,   867,  1028,   861,
+     859,   465,   900,   470,   864,   862,   444,   875,   898,   455,
+     873,  1033,   662,   871,   889,   488,   613,   642,   494,   609,
+     490,  1041,  1061,  1078,    -1,    -1,   893,    -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,  1026,    -1,    -1,    -1,
-      -1,  1031,    -1,    -1,    -1,    -1,  1031,    -1,    -1,  1039,
-      -1,    -1,  1026,    -1,  1026,    -1,    -1,    -1,    -1,  1031,
-      -1,    -1,    -1,    -1,    -1,    -1,  1026,  1039,    -1,    -1,
-    1026,  1031,    -1,    -1,    -1,  1031,    -1,    -1,    -1,    -1,
-      -1,    -1,  1026,  1039,    -1,    -1,  1026,    -1,    -1,    -1,
-      -1,  1031,    -1,    -1,    -1,    -1,    -1,    -1,  1026,  1039,
-      -1,  1026,  1026,  1031,  1026,  1026,    -1,    -1,    -1,  1031,
-      -1,    -1,    -1,    -1,    -1,    -1,  1026,  1026,    -1,    -1,
-    1026,  1031,    -1,  1026,    -1,    -1,    -1,  1026,    -1,  1026,
-      -1,  1026,    -1,    -1,  1026,  1026
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1028,    -1,
+      -1,    -1,    -1,  1033,    -1,    -1,    -1,    -1,  1033,    -1,
+    1028,  1041,    -1,  1028,  1028,  1033,  1028,    -1,    -1,    -1,
+      -1,  1033,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1028,
+      -1,    -1,    -1,  1028,  1033,    -1,    -1,    -1,  1033,    -1,
+      -1,  1028,  1041,    -1,  1028,    -1,  1041,    -1,    -1,  1028,
+      -1,  1028,    -1,    -1,  1033,    -1,    -1,    -1,    -1,  1028,
+      -1,  1028,  1041,  1028,    -1,    -1,  1033,  1028,    -1,    -1,
+      -1,    -1,  1033,    -1,  1028,    -1,    -1,  1028,    -1,  1028,
+    1028,    -1,    -1,    -1,    -1,    -1,    -1,  1028,    -1,    -1,
+    1028
   };
 
   const unsigned short
@@ -4590,101 +4590,101 @@ namespace isc { namespace dhcp {
       29,    30,    31,    32,    33,    56,    57,    58,    59,    60,
       61,    62,    63,    64,    65,    66,    70,    71,    81,    84,
       85,    89,    94,    95,   100,   110,   113,   120,   121,   124,
-     125,   148,   208,   217,   218,   219,   220,   221,   222,   223,
-     224,   225,   226,   227,   228,   230,   231,   232,   233,   248,
-     250,   256,   258,   295,   304,   318,   328,   352,   356,   364,
-     390,   420,   422,   424,   435,   437,   439,   462,   474,   475,
-     483,   485,   523,   538,    15,    16,    19,    22,   208,   235,
-     236,   239,   241,   244,   247,   420,   422,    67,    68,    69,
-      82,    86,    87,    88,    96,    99,   107,   208,   219,   220,
-     221,   222,   223,   224,   225,   226,   231,   232,   336,   337,
-     338,   340,   342,   344,   346,   348,   350,   352,   355,   390,
-     408,   420,   422,   424,   435,   437,   439,   459,    83,   208,
-     348,   350,   390,   416,   417,   418,   420,   422,    95,   101,
-     102,   103,   104,   105,   106,   108,   208,   390,   420,   422,
-     432,   433,   434,   435,   437,   439,   441,   445,   447,   449,
-     451,   453,   455,   457,   364,    34,    72,    74,    75,    78,
-      79,    80,   208,   276,   374,   375,   376,   377,   378,   379,
-     380,   382,   384,   386,   387,   389,   420,   422,    73,    76,
-      77,   208,   276,   378,   384,   398,   399,   400,   401,   402,
-     404,   405,   406,   407,   420,   422,   111,   112,   208,   312,
-     313,   314,   316,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   145,   146,   208,   420,
-     422,   489,   490,   491,   492,   494,   496,   497,   499,   500,
-     501,   504,   506,   507,   508,   511,   513,   515,   536,   537,
-     538,    12,    13,   527,   528,   529,   531,     6,     3,     4,
-       8,     3,   214,   533,   518,   520,   522,     4,     3,     8,
-     524,   234,   251,     4,     4,     4,   436,   438,   440,   249,
-     257,   259,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,   229,   329,   365,   391,   357,   421,   423,   353,   296,
-     463,   425,   305,   319,     4,   476,   484,   486,   539,     3,
-       8,   240,   242,   245,     4,     3,     8,   341,   343,   345,
-     409,   339,   347,     4,   351,   349,   460,     3,     8,   419,
-       3,     8,   458,   446,   448,   452,   450,   456,   454,   442,
-       8,     3,     8,   381,   277,     4,   385,   383,   388,     4,
-       8,     3,   403,     4,     4,     8,     3,   315,   317,     3,
-       8,     4,   493,   495,     4,   498,     4,     4,   502,   505,
-       4,     4,   509,   512,   514,   516,     3,     8,     3,     8,
-     530,     4,     3,     8,   193,   193,   173,     4,     4,     4,
-       4,     4,   212,     4,     4,     4,   176,   176,   176,     4,
-       4,     4,     4,     4,     4,   174,   174,   174,   174,   174,
-     176,   175,   175,   174,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,   174,     4,     4,
-       4,     4,   218,     4,     4,     4,   176,   236,     4,     4,
-       4,     4,     4,     4,   174,     4,     4,     4,   337,     4,
-     417,     4,     4,     4,     4,     4,     4,     4,     4,   434,
-       4,     4,   174,     4,     4,     4,   176,   376,     4,   176,
-     176,   400,     4,     4,   313,   176,     4,     4,   174,     4,
-     174,   174,     4,     4,   176,   176,     4,     4,     4,     4,
-     490,   537,     4,   174,   528,     4,     7,     7,   193,   193,
-     193,     7,     7,     7,   173,   173,   173,     7,     7,     5,
-     173,     5,     5,     5,     5,   195,   197,   173,    90,    91,
-      92,    93,   354,     5,     5,     5,     5,     7,     7,   197,
-       7,     5,     5,   204,    17,    18,   243,    20,    21,   246,
-     173,   173,   173,     5,   173,   173,   204,   173,     7,   173,
-     204,   173,   173,   173,   173,   173,   173,   173,   173,   173,
-     173,   173,   173,   173,   173,   193,   173,   173,   173,    18,
-     139,   503,   140,   141,   142,   143,   144,   176,   510,   173,
-     173,   173,     5,   193,   217,   536,   527,   235,    24,   252,
-     253,   254,    34,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-     208,   264,   265,   266,   269,   271,   273,   275,   276,   278,
-     279,   280,   281,   282,   283,   284,   285,   287,   289,   291,
-     293,   294,   264,     7,   260,   261,   262,     7,   330,   331,
-     332,     7,   368,   369,   370,     7,   392,   393,   394,     7,
-     358,   359,   360,   101,   102,   103,   104,   106,   297,   298,
-     299,   300,   301,   302,   303,     7,   464,   465,     7,   426,
-     427,   428,     7,   306,   307,   308,   114,   115,   116,   117,
-     118,   119,   320,   321,   322,   323,   324,   325,   326,   327,
-     122,   123,   208,   420,   422,   477,   478,   479,   481,   489,
-       7,   540,   541,   205,     7,   410,   411,   412,   109,   441,
-     443,   461,   260,     8,     8,     8,     8,   255,     3,     8,
-     267,   270,   272,   274,     4,     4,     4,     4,     4,   286,
-     288,   290,   292,     4,     4,     4,     4,     4,     3,     8,
-       8,   263,     6,     3,   333,     6,     3,   371,     6,     3,
-     395,     6,     3,   361,     6,     3,     3,     6,   466,     3,
-       6,   429,     6,     3,   309,     6,     3,     4,     4,     4,
-       4,     4,     4,     3,     8,   480,   482,     3,     8,     8,
-     542,     3,     6,   173,   206,   207,   413,     6,     3,   444,
-       8,     6,     4,   253,     4,     4,     4,     4,   174,   176,
-     174,   176,   174,     4,     4,     4,     4,   174,   174,   174,
-     174,   176,   265,   264,   262,   336,   332,   374,   370,   398,
-     394,   208,   219,   220,   221,   222,   223,   224,   225,   226,
-     231,   232,   276,   328,   346,   348,   350,   352,   362,   363,
-     390,   420,   422,   435,   437,   439,   459,   360,   298,    97,
-      98,   208,   276,   364,   390,   420,   422,   435,   437,   439,
-     467,   468,   469,   470,   471,   473,   465,   432,   428,   312,
-     308,   174,   174,   174,   174,   174,   174,   321,     4,     4,
-     478,   149,   151,   152,   208,   276,   420,   422,   543,   544,
-     545,   546,   548,   541,     6,     3,   416,   412,     4,   173,
-      35,    36,    37,    38,   268,   173,   173,   173,   173,   173,
-     173,   173,     8,     8,     8,     8,     3,     8,   472,     4,
-       8,     3,     8,     8,   173,   173,   549,     4,   547,     3,
-       8,   173,     8,   204,   363,     4,   176,   469,     4,   174,
-       4,   544,   173,     5,   173,     7,   550,   551,   552,     3,
-       6,   150,   153,   154,   155,   553,   554,   555,   557,   558,
-     559,   551,   556,     4,     4,     4,     3,     8,     4,   176,
-     174,   174,   554,   173
+     125,   145,   146,   148,   208,   217,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   230,   231,   232,
+     233,   248,   250,   256,   258,   295,   304,   318,   328,   352,
+     356,   364,   390,   420,   422,   424,   435,   437,   439,   462,
+     474,   475,   483,   485,   513,   515,   523,   538,    15,    16,
+      19,    22,   208,   235,   236,   239,   241,   244,   247,   420,
+     422,    67,    68,    69,    82,    86,    87,    88,    96,    99,
+     107,   208,   219,   220,   221,   222,   223,   224,   225,   226,
+     231,   232,   336,   337,   338,   340,   342,   344,   346,   348,
+     350,   352,   355,   390,   408,   420,   422,   424,   435,   437,
+     439,   459,    83,   208,   348,   350,   390,   416,   417,   418,
+     420,   422,    95,   101,   102,   103,   104,   105,   106,   108,
+     208,   390,   420,   422,   432,   433,   434,   435,   437,   439,
+     441,   445,   447,   449,   451,   453,   455,   457,   364,    34,
+      72,    74,    75,    78,    79,    80,   208,   276,   374,   375,
+     376,   377,   378,   379,   380,   382,   384,   386,   387,   389,
+     420,   422,    73,    76,    77,   208,   276,   378,   384,   398,
+     399,   400,   401,   402,   404,   405,   406,   407,   420,   422,
+     111,   112,   208,   312,   313,   314,   316,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     208,   420,   422,   489,   490,   491,   492,   494,   496,   497,
+     499,   500,   501,   504,   506,   507,   508,   511,   513,   515,
+     536,   537,   538,    12,    13,   527,   528,   529,   531,     6,
+       3,     4,     8,     3,   214,   533,   518,   520,   522,     4,
+       3,     8,   524,   234,   251,     4,     4,     4,   436,   438,
+     440,   249,   257,   259,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,   229,   329,   365,   391,   357,   421,   423,
+     353,   296,   463,   425,   305,   319,     4,   476,   484,   486,
+     514,   516,   539,     3,     8,   240,   242,   245,     4,     3,
+       8,   341,   343,   345,   409,   339,   347,     4,   351,   349,
+     460,     3,     8,   419,     3,     8,   458,   446,   448,   452,
+     450,   456,   454,   442,     8,     3,     8,   381,   277,     4,
+     385,   383,   388,     4,     8,     3,   403,     4,     4,     8,
+       3,   315,   317,     3,     8,     4,   493,   495,     4,   498,
+       4,     4,   502,   505,     4,     4,   509,   512,     3,     8,
+       3,     8,   530,     4,     3,     8,   193,   193,   173,     4,
+       4,     4,     4,     4,   212,     4,     4,     4,   176,   176,
+     176,     4,     4,     4,     4,     4,     4,   174,   174,   174,
+     174,   174,   176,   175,   175,   174,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,   174,
+       4,     4,     4,     4,     4,     4,   218,     4,     4,     4,
+     176,   236,     4,     4,     4,     4,     4,     4,   174,     4,
+       4,     4,   337,     4,   417,     4,     4,     4,     4,     4,
+       4,     4,     4,   434,     4,     4,   174,     4,     4,     4,
+     176,   376,     4,   176,   176,   400,     4,     4,   313,   176,
+       4,     4,   174,     4,   174,   174,     4,     4,   176,   176,
+       4,     4,   490,   537,     4,   174,   528,     4,     7,     7,
+     193,   193,   193,     7,     7,     7,   173,   173,   173,     7,
+       7,     5,   173,     5,     5,     5,     5,   195,   197,   173,
+      90,    91,    92,    93,   354,     5,     5,     5,     5,     7,
+       7,   197,     7,   173,   173,     5,     5,   204,    17,    18,
+     243,    20,    21,   246,   173,   173,   173,     5,   173,   173,
+     204,   173,     7,   173,   204,   173,   173,   173,   173,   173,
+     173,   173,   173,   173,   173,   173,   173,   173,   173,   193,
+     173,   173,   173,    18,   139,   503,   140,   141,   142,   143,
+     144,   176,   510,   173,     5,   193,   217,   536,   527,   235,
+      24,   252,   253,   254,    34,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,   208,   264,   265,   266,   269,   271,   273,   275,
+     276,   278,   279,   280,   281,   282,   283,   284,   285,   287,
+     289,   291,   293,   294,   264,     7,   260,   261,   262,     7,
+     330,   331,   332,     7,   368,   369,   370,     7,   392,   393,
+     394,     7,   358,   359,   360,   101,   102,   103,   104,   106,
+     297,   298,   299,   300,   301,   302,   303,     7,   464,   465,
+       7,   426,   427,   428,     7,   306,   307,   308,   114,   115,
+     116,   117,   118,   119,   320,   321,   322,   323,   324,   325,
+     326,   327,   122,   123,   208,   420,   422,   477,   478,   479,
+     481,   489,     7,   540,   541,   205,     7,   410,   411,   412,
+     109,   441,   443,   461,   260,     8,     8,     8,     8,   255,
+       3,     8,   267,   270,   272,   274,     4,     4,     4,     4,
+       4,   286,   288,   290,   292,     4,     4,     4,     4,     4,
+       3,     8,     8,   263,     6,     3,   333,     6,     3,   371,
+       6,     3,   395,     6,     3,   361,     6,     3,     3,     6,
+     466,     3,     6,   429,     6,     3,   309,     6,     3,     4,
+       4,     4,     4,     4,     4,     3,     8,   480,   482,     3,
+       8,     8,   542,     3,     6,   173,   206,   207,   413,     6,
+       3,   444,     8,     6,     4,   253,     4,     4,     4,     4,
+     174,   176,   174,   176,   174,     4,     4,     4,     4,   174,
+     174,   174,   174,   176,   265,   264,   262,   336,   332,   374,
+     370,   398,   394,   208,   219,   220,   221,   222,   223,   224,
+     225,   226,   231,   232,   276,   328,   346,   348,   350,   352,
+     362,   363,   390,   420,   422,   435,   437,   439,   459,   360,
+     298,    97,    98,   208,   276,   364,   390,   420,   422,   435,
+     437,   439,   467,   468,   469,   470,   471,   473,   465,   432,
+     428,   312,   308,   174,   174,   174,   174,   174,   174,   321,
+       4,     4,   478,   149,   151,   152,   208,   276,   420,   422,
+     543,   544,   545,   546,   548,   541,     6,     3,   416,   412,
+       4,   173,    35,    36,    37,    38,   268,   173,   173,   173,
+     173,   173,   173,   173,     8,     8,     8,     8,     3,     8,
+     472,     4,     8,     3,     8,     8,   173,   173,   549,     4,
+     547,     3,     8,   173,     8,   204,   363,     4,   176,   469,
+       4,   174,     4,   544,   173,     5,   173,     7,   550,   551,
+     552,     3,     6,   150,   153,   154,   155,   553,   554,   555,
+     557,   558,   559,   551,   556,     4,     4,     4,     3,     8,
+       4,   176,   174,   174,   554,   173
   };
 
   const unsigned short
@@ -4701,63 +4701,63 @@ namespace isc { namespace dhcp {
      218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
      218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
      218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
-     218,   218,   218,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   229,   228,   230,   231,   232,   234,   233,
-     235,   235,   236,   236,   236,   236,   236,   236,   236,   238,
-     237,   240,   239,   242,   241,   243,   243,   245,   244,   246,
-     246,   247,   249,   248,   251,   250,   252,   252,   253,   255,
-     254,   257,   256,   259,   258,   260,   260,   261,   261,   263,
-     262,   264,   264,   265,   265,   265,   265,   265,   265,   265,
+     218,   218,   218,   218,   218,   218,   219,   220,   221,   222,
+     223,   224,   225,   226,   227,   229,   228,   230,   231,   232,
+     234,   233,   235,   235,   236,   236,   236,   236,   236,   236,
+     236,   238,   237,   240,   239,   242,   241,   243,   243,   245,
+     244,   246,   246,   247,   249,   248,   251,   250,   252,   252,
+     253,   255,   254,   257,   256,   259,   258,   260,   260,   261,
+     261,   263,   262,   264,   264,   265,   265,   265,   265,   265,
      265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
-     265,   265,   265,   267,   266,   268,   268,   268,   268,   270,
-     269,   272,   271,   274,   273,   275,   277,   276,   278,   279,
-     280,   281,   282,   283,   284,   286,   285,   288,   287,   290,
-     289,   292,   291,   293,   294,   296,   295,   297,   297,   298,
-     298,   298,   298,   298,   299,   300,   301,   302,   303,   305,
-     304,   306,   306,   307,   307,   309,   308,   311,   310,   312,
-     312,   312,   313,   313,   315,   314,   317,   316,   319,   318,
-     320,   320,   321,   321,   321,   321,   321,   321,   322,   323,
-     324,   325,   326,   327,   329,   328,   330,   330,   331,   331,
-     333,   332,   335,   334,   336,   336,   337,   337,   337,   337,
+     265,   265,   265,   265,   265,   267,   266,   268,   268,   268,
+     268,   270,   269,   272,   271,   274,   273,   275,   277,   276,
+     278,   279,   280,   281,   282,   283,   284,   286,   285,   288,
+     287,   290,   289,   292,   291,   293,   294,   296,   295,   297,
+     297,   298,   298,   298,   298,   298,   299,   300,   301,   302,
+     303,   305,   304,   306,   306,   307,   307,   309,   308,   311,
+     310,   312,   312,   312,   313,   313,   315,   314,   317,   316,
+     319,   318,   320,   320,   321,   321,   321,   321,   321,   321,
+     322,   323,   324,   325,   326,   327,   329,   328,   330,   330,
+     331,   331,   333,   332,   335,   334,   336,   336,   337,   337,
      337,   337,   337,   337,   337,   337,   337,   337,   337,   337,
      337,   337,   337,   337,   337,   337,   337,   337,   337,   337,
-     337,   337,   337,   337,   337,   339,   338,   341,   340,   343,
-     342,   345,   344,   347,   346,   349,   348,   351,   350,   353,
-     352,   354,   354,   354,   354,   355,   357,   356,   358,   358,
-     359,   359,   361,   360,   362,   362,   363,   363,   363,   363,
+     337,   337,   337,   337,   337,   337,   337,   339,   338,   341,
+     340,   343,   342,   345,   344,   347,   346,   349,   348,   351,
+     350,   353,   352,   354,   354,   354,   354,   355,   357,   356,
+     358,   358,   359,   359,   361,   360,   362,   362,   363,   363,
      363,   363,   363,   363,   363,   363,   363,   363,   363,   363,
      363,   363,   363,   363,   363,   363,   363,   363,   363,   363,
-     365,   364,   367,   366,   368,   368,   369,   369,   371,   370,
-     373,   372,   374,   374,   375,   375,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   377,   378,   379,   381,
-     380,   383,   382,   385,   384,   386,   388,   387,   389,   391,
-     390,   392,   392,   393,   393,   395,   394,   397,   396,   398,
-     398,   399,   399,   400,   400,   400,   400,   400,   400,   400,
-     400,   400,   401,   403,   402,   404,   405,   406,   407,   409,
-     408,   410,   410,   411,   411,   413,   412,   415,   414,   416,
-     416,   417,   417,   417,   417,   417,   417,   417,   419,   418,
-     421,   420,   423,   422,   425,   424,   426,   426,   427,   427,
-     429,   428,   431,   430,   432,   432,   433,   433,   434,   434,
+     363,   363,   365,   364,   367,   366,   368,   368,   369,   369,
+     371,   370,   373,   372,   374,   374,   375,   375,   376,   376,
+     376,   376,   376,   376,   376,   376,   376,   376,   377,   378,
+     379,   381,   380,   383,   382,   385,   384,   386,   388,   387,
+     389,   391,   390,   392,   392,   393,   393,   395,   394,   397,
+     396,   398,   398,   399,   399,   400,   400,   400,   400,   400,
+     400,   400,   400,   400,   401,   403,   402,   404,   405,   406,
+     407,   409,   408,   410,   410,   411,   411,   413,   412,   415,
+     414,   416,   416,   417,   417,   417,   417,   417,   417,   417,
+     419,   418,   421,   420,   423,   422,   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,   434,   434,   436,   435,   438,   437,   440,   439,   442,
-     441,   444,   443,   446,   445,   448,   447,   450,   449,   452,
-     451,   454,   453,   456,   455,   458,   457,   460,   459,   461,
-     461,   463,   462,   464,   464,   466,   465,   467,   467,   468,
-     468,   469,   469,   469,   469,   469,   469,   469,   469,   469,
-     469,   469,   470,   472,   471,   473,   474,   476,   475,   477,
-     477,   478,   478,   478,   478,   478,   480,   479,   482,   481,
-     484,   483,   486,   485,   488,   487,   489,   489,   490,   490,
+     434,   434,   434,   434,   434,   436,   435,   438,   437,   440,
+     439,   442,   441,   444,   443,   446,   445,   448,   447,   450,
+     449,   452,   451,   454,   453,   456,   455,   458,   457,   460,
+     459,   461,   461,   463,   462,   464,   464,   466,   465,   467,
+     467,   468,   468,   469,   469,   469,   469,   469,   469,   469,
+     469,   469,   469,   469,   470,   472,   471,   473,   474,   476,
+     475,   477,   477,   478,   478,   478,   478,   478,   480,   479,
+     482,   481,   484,   483,   486,   485,   488,   487,   489,   489,
      490,   490,   490,   490,   490,   490,   490,   490,   490,   490,
-     490,   490,   490,   490,   490,   490,   491,   493,   492,   495,
-     494,   496,   498,   497,   499,   500,   502,   501,   503,   503,
-     505,   504,   506,   507,   509,   508,   510,   510,   510,   510,
-     510,   512,   511,   514,   513,   516,   515,   518,   517,   520,
-     519,   522,   521,   524,   523,   526,   525,   527,   527,   528,
-     528,   530,   529,   531,   533,   532,   535,   534,   536,   536,
-     537,   539,   538,   540,   540,   542,   541,   543,   543,   544,
-     544,   544,   544,   544,   544,   544,   545,   547,   546,   549,
-     548,   550,   550,   552,   551,   553,   553,   554,   554,   554,
-     554,   556,   555,   557,   558,   559
+     490,   490,   490,   490,   490,   490,   490,   490,   491,   493,
+     492,   495,   494,   496,   498,   497,   499,   500,   502,   501,
+     503,   503,   505,   504,   506,   507,   509,   508,   510,   510,
+     510,   510,   510,   512,   511,   514,   513,   516,   515,   518,
+     517,   520,   519,   522,   521,   524,   523,   526,   525,   527,
+     527,   528,   528,   530,   529,   531,   533,   532,   535,   534,
+     536,   536,   537,   539,   538,   540,   540,   542,   541,   543,
+     543,   544,   544,   544,   544,   544,   544,   544,   545,   547,
+     546,   549,   548,   550,   550,   552,   551,   553,   553,   554,
+     554,   554,   554,   556,   555,   557,   558,   559
   };
 
   const unsigned char
@@ -4774,63 +4774,63 @@ namespace isc { namespace dhcp {
        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,     3,     3,     3,     3,     3,     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,     3,     3,     3,     3,
+       3,     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,     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,     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,     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,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     4,     0,     4,     0,
+       1,     1,     1,     1,     1,     1,     1,     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,
+       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,     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,
+       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,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     4,     0,     4,     0,     4,     0,
+       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,     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,
+       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,     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,     6,     0,     4,     1,     3,     1,
-       1,     0,     6,     3,     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
+       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,     6,     0,     4,     1,
+       3,     1,     1,     0,     6,     3,     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
   };
 
 
@@ -4999,63 +4999,63 @@ namespace isc { namespace dhcp {
      451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
      461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
      471,   472,   473,   474,   475,   476,   477,   478,   479,   480,
-     481,   482,   483,   484,   487,   492,   497,   502,   507,   512,
-     517,   522,   527,   532,   532,   540,   545,   550,   556,   556,
-     567,   568,   571,   572,   573,   574,   575,   576,   577,   580,
-     580,   589,   589,   599,   599,   606,   607,   610,   610,   617,
-     619,   623,   629,   629,   641,   641,   651,   652,   654,   656,
-     656,   674,   674,   686,   686,   696,   697,   700,   701,   704,
-     704,   714,   715,   718,   719,   720,   721,   722,   723,   724,
+     481,   482,   483,   484,   485,   486,   489,   494,   499,   504,
+     509,   514,   519,   524,   529,   534,   534,   542,   547,   552,
+     558,   558,   569,   570,   573,   574,   575,   576,   577,   578,
+     579,   582,   582,   591,   591,   601,   601,   608,   609,   612,
+     612,   619,   621,   625,   631,   631,   643,   643,   653,   654,
+     656,   658,   658,   676,   676,   688,   688,   698,   699,   702,
+     703,   706,   706,   716,   717,   720,   721,   722,   723,   724,
      725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
-     735,   736,   737,   740,   740,   747,   748,   749,   750,   753,
-     753,   761,   761,   769,   769,   777,   782,   782,   790,   795,
-     800,   805,   810,   815,   820,   825,   825,   833,   833,   841,
-     841,   849,   849,   857,   862,   867,   867,   877,   878,   881,
-     882,   883,   884,   885,   888,   893,   898,   903,   908,   913,
-     913,   923,   924,   927,   928,   931,   931,   941,   941,   951,
-     952,   953,   956,   957,   960,   960,   968,   968,   976,   976,
-     987,   988,   991,   992,   993,   994,   995,   996,   999,  1004,
-    1009,  1014,  1019,  1024,  1032,  1032,  1045,  1046,  1049,  1050,
-    1057,  1057,  1083,  1083,  1094,  1095,  1099,  1100,  1101,  1102,
+     735,   736,   737,   738,   739,   742,   742,   749,   750,   751,
+     752,   755,   755,   763,   763,   771,   771,   779,   784,   784,
+     792,   797,   802,   807,   812,   817,   822,   827,   827,   835,
+     835,   843,   843,   851,   851,   859,   864,   869,   869,   879,
+     880,   883,   884,   885,   886,   887,   890,   895,   900,   905,
+     910,   915,   915,   925,   926,   929,   930,   933,   933,   943,
+     943,   953,   954,   955,   958,   959,   962,   962,   970,   970,
+     978,   978,   989,   990,   993,   994,   995,   996,   997,   998,
+    1001,  1006,  1011,  1016,  1021,  1026,  1034,  1034,  1047,  1048,
+    1051,  1052,  1059,  1059,  1085,  1085,  1096,  1097,  1101,  1102,
     1103,  1104,  1105,  1106,  1107,  1108,  1109,  1110,  1111,  1112,
     1113,  1114,  1115,  1116,  1117,  1118,  1119,  1120,  1121,  1122,
-    1123,  1124,  1125,  1126,  1127,  1130,  1130,  1138,  1138,  1146,
-    1146,  1154,  1154,  1162,  1162,  1170,  1170,  1178,  1178,  1188,
-    1188,  1195,  1196,  1197,  1198,  1201,  1208,  1208,  1219,  1220,
-    1224,  1225,  1228,  1228,  1236,  1237,  1240,  1241,  1242,  1243,
+    1123,  1124,  1125,  1126,  1127,  1128,  1129,  1132,  1132,  1140,
+    1140,  1148,  1148,  1156,  1156,  1164,  1164,  1172,  1172,  1180,
+    1180,  1190,  1190,  1197,  1198,  1199,  1200,  1203,  1210,  1210,
+    1221,  1222,  1226,  1227,  1230,  1230,  1238,  1239,  1242,  1243,
     1244,  1245,  1246,  1247,  1248,  1249,  1250,  1251,  1252,  1253,
     1254,  1255,  1256,  1257,  1258,  1259,  1260,  1261,  1262,  1263,
-    1270,  1270,  1283,  1283,  1292,  1293,  1296,  1297,  1302,  1302,
-    1317,  1317,  1331,  1332,  1335,  1336,  1339,  1340,  1341,  1342,
-    1343,  1344,  1345,  1346,  1347,  1348,  1351,  1353,  1358,  1360,
-    1360,  1368,  1368,  1376,  1376,  1384,  1386,  1386,  1394,  1403,
-    1403,  1415,  1416,  1421,  1422,  1427,  1427,  1439,  1439,  1451,
-    1452,  1457,  1458,  1463,  1464,  1465,  1466,  1467,  1468,  1469,
-    1470,  1471,  1474,  1476,  1476,  1484,  1486,  1488,  1493,  1501,
-    1501,  1513,  1514,  1517,  1518,  1521,  1521,  1531,  1531,  1541,
-    1542,  1545,  1546,  1547,  1548,  1549,  1550,  1551,  1554,  1554,
-    1562,  1562,  1587,  1587,  1617,  1617,  1627,  1628,  1631,  1632,
-    1635,  1635,  1644,  1644,  1653,  1654,  1657,  1658,  1662,  1663,
+    1264,  1265,  1272,  1272,  1285,  1285,  1294,  1295,  1298,  1299,
+    1304,  1304,  1319,  1319,  1333,  1334,  1337,  1338,  1341,  1342,
+    1343,  1344,  1345,  1346,  1347,  1348,  1349,  1350,  1353,  1355,
+    1360,  1362,  1362,  1370,  1370,  1378,  1378,  1386,  1388,  1388,
+    1396,  1405,  1405,  1417,  1418,  1423,  1424,  1429,  1429,  1441,
+    1441,  1453,  1454,  1459,  1460,  1465,  1466,  1467,  1468,  1469,
+    1470,  1471,  1472,  1473,  1476,  1478,  1478,  1486,  1488,  1490,
+    1495,  1503,  1503,  1515,  1516,  1519,  1520,  1523,  1523,  1533,
+    1533,  1543,  1544,  1547,  1548,  1549,  1550,  1551,  1552,  1553,
+    1556,  1556,  1564,  1564,  1589,  1589,  1619,  1619,  1629,  1630,
+    1633,  1634,  1637,  1637,  1646,  1646,  1655,  1656,  1659,  1660,
     1664,  1665,  1666,  1667,  1668,  1669,  1670,  1671,  1672,  1673,
-    1674,  1675,  1676,  1679,  1679,  1687,  1687,  1695,  1695,  1703,
-    1703,  1711,  1711,  1721,  1721,  1729,  1729,  1737,  1737,  1745,
-    1745,  1753,  1753,  1761,  1761,  1769,  1769,  1782,  1782,  1792,
-    1793,  1799,  1799,  1809,  1810,  1813,  1813,  1823,  1824,  1827,
-    1828,  1831,  1832,  1833,  1834,  1835,  1836,  1837,  1838,  1839,
-    1840,  1841,  1844,  1846,  1846,  1854,  1863,  1870,  1870,  1880,
-    1881,  1884,  1885,  1886,  1887,  1888,  1891,  1891,  1899,  1899,
-    1910,  1910,  1948,  1948,  1960,  1960,  1970,  1971,  1974,  1975,
+    1674,  1675,  1676,  1677,  1678,  1681,  1681,  1689,  1689,  1697,
+    1697,  1705,  1705,  1713,  1713,  1723,  1723,  1731,  1731,  1739,
+    1739,  1747,  1747,  1755,  1755,  1763,  1763,  1771,  1771,  1784,
+    1784,  1794,  1795,  1801,  1801,  1811,  1812,  1815,  1815,  1825,
+    1826,  1829,  1830,  1833,  1834,  1835,  1836,  1837,  1838,  1839,
+    1840,  1841,  1842,  1843,  1846,  1848,  1848,  1856,  1865,  1872,
+    1872,  1882,  1883,  1886,  1887,  1888,  1889,  1890,  1893,  1893,
+    1901,  1901,  1912,  1912,  1950,  1950,  1962,  1962,  1972,  1973,
     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,  2121,  2121,  2128,
-    2128,  2135,  2135,  2142,  2142,  2153,  2153,  2163,  2164,  2168,
-    2169,  2172,  2172,  2182,  2192,  2192,  2202,  2202,  2213,  2214,
-    2218,  2222,  2222,  2234,  2235,  2239,  2239,  2247,  2248,  2251,
-    2252,  2253,  2254,  2255,  2256,  2257,  2260,  2265,  2265,  2273,
-    2273,  2283,  2284,  2287,  2287,  2295,  2296,  2299,  2300,  2301,
-    2302,  2305,  2305,  2313,  2318,  2323
+    1986,  1987,  1988,  1989,  1990,  1991,  1992,  1993,  1996,  2001,
+    2001,  2009,  2009,  2017,  2022,  2022,  2030,  2035,  2040,  2040,
+    2048,  2049,  2052,  2052,  2060,  2065,  2070,  2070,  2078,  2081,
+    2084,  2087,  2090,  2096,  2096,  2104,  2104,  2112,  2112,  2123,
+    2123,  2130,  2130,  2137,  2137,  2144,  2144,  2155,  2155,  2165,
+    2166,  2170,  2171,  2174,  2174,  2184,  2194,  2194,  2204,  2204,
+    2215,  2216,  2220,  2224,  2224,  2236,  2237,  2241,  2241,  2249,
+    2250,  2253,  2254,  2255,  2256,  2257,  2258,  2259,  2262,  2267,
+    2267,  2275,  2275,  2285,  2286,  2289,  2289,  2297,  2298,  2301,
+    2302,  2303,  2304,  2307,  2307,  2315,  2320,  2325
   };
 
   // Print the state stack on the debug stream.
@@ -5092,7 +5092,7 @@ namespace isc { namespace dhcp {
 } } // isc::dhcp
 #line 5094 "dhcp4_parser.cc"
 
-#line 2328 "dhcp4_parser.yy"
+#line 2330 "dhcp4_parser.yy"
 
 
 void
diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h
index 6fdade1faf..009f8d226b 100644
--- a/src/bin/dhcp4/dhcp4_parser.h
+++ b/src/bin/dhcp4/dhcp4_parser.h
@@ -3903,7 +3903,7 @@ switch (yytype)
     enum
     {
       yyeof_ = 0,
-      yylast_ = 1055,     ///< Last index in yytable_.
+      yylast_ = 1050,     ///< Last index in yytable_.
       yynnts_ = 383,  ///< 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 6a79b0f511..6679c2c06a 100644
--- a/src/bin/dhcp4/location.hh
+++ b/src/bin/dhcp4/location.hh
@@ -1,4 +1,4 @@
-// Generated 201906181715
+// Generated 201906181917
 // A Bison parser, made by GNU Bison 3.4.1.
 
 // Locations for Bison parsers in C++
diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh
index 4640297fec..49726e93a5 100644
--- a/src/bin/dhcp4/position.hh
+++ b/src/bin/dhcp4/position.hh
@@ -1,4 +1,4 @@
-// Generated 201906181715
+// Generated 201906181917
 // A Bison parser, made by GNU Bison 3.4.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 5bfd9a6442..53c2d96620 100644
--- a/src/bin/dhcp4/stack.hh
+++ b/src/bin/dhcp4/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201906181715
+// Generated 201906181917
 // A Bison parser, made by GNU Bison 3.4.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 52d84cb093..d58e3cd43e 100644
--- a/src/bin/dhcp6/dhcp6_lexer.cc
+++ b/src/bin/dhcp6/dhcp6_lexer.cc
@@ -1768,24 +1768,24 @@ static const flex_int16_t yy_rule_linenum[190] =
     {   0,
       149,  151,  153,  158,  159,  164,  165,  166,  178,  181,
       186,  193,  202,  211,  220,  229,  238,  247,  256,  265,
-      274,  283,  292,  301,  310,  319,  328,  338,  348,  358,
-      368,  378,  387,  397,  407,  417,  427,  436,  445,  454,
-      463,  472,  481,  490,  499,  508,  517,  526,  535,  544,
-      553,  566,  575,  584,  593,  602,  613,  624,  635,  646,
-      658,  669,  680,  691,  702,  713,  724,  735,  746,  757,
-      768,  779,  790,  801,  812,  823,  834,  845,  856,  867,
-      876,  885,  895,  904,  913,  928,  944,  953,  962,  971,
-      980,  989,  998, 1007, 1016, 1025, 1034, 1056, 1078, 1087,
-
-     1097, 1107, 1116, 1126, 1137, 1146, 1155, 1164, 1173, 1182,
-     1192, 1201, 1210, 1219, 1230, 1241, 1252, 1261, 1271, 1280,
-     1289, 1298, 1307, 1317, 1326, 1335, 1345, 1357, 1370, 1379,
-     1388, 1398, 1408, 1417, 1428, 1438, 1447, 1457, 1467, 1476,
-     1485, 1494, 1503, 1513, 1522, 1532, 1541, 1550, 1559, 1568,
-     1577, 1586, 1595, 1604, 1613, 1622, 1631, 1640, 1649, 1658,
-     1667, 1676, 1685, 1694, 1703, 1712, 1721, 1730, 1739, 1748,
-     1757, 1767, 1866, 1871, 1876, 1881, 1882, 1883, 1884, 1885,
-     1886, 1888, 1906, 1919, 1924, 1928, 1930, 1932, 1934
+      274,  283,  292,  301,  310,  320,  330,  340,  350,  360,
+      370,  380,  389,  399,  409,  419,  429,  438,  447,  456,
+      465,  474,  483,  492,  501,  510,  519,  528,  537,  546,
+      555,  568,  577,  586,  595,  604,  615,  626,  637,  648,
+      660,  671,  682,  693,  704,  715,  726,  737,  748,  759,
+      770,  781,  792,  803,  814,  825,  836,  847,  858,  869,
+      878,  887,  897,  906,  915,  930,  946,  955,  964,  973,
+      982,  991, 1000, 1009, 1018, 1027, 1036, 1058, 1080, 1089,
+
+     1099, 1109, 1118, 1128, 1139, 1148, 1157, 1166, 1175, 1184,
+     1194, 1203, 1212, 1221, 1232, 1243, 1254, 1263, 1273, 1282,
+     1291, 1300, 1309, 1319, 1328, 1337, 1347, 1359, 1372, 1381,
+     1390, 1400, 1410, 1419, 1430, 1440, 1449, 1459, 1469, 1478,
+     1487, 1496, 1505, 1515, 1524, 1534, 1543, 1552, 1561, 1570,
+     1579, 1588, 1597, 1606, 1615, 1624, 1633, 1642, 1651, 1660,
+     1669, 1678, 1687, 1696, 1705, 1714, 1723, 1732, 1741, 1750,
+     1759, 1769, 1868, 1873, 1878, 1883, 1884, 1885, 1886, 1887,
+     1888, 1890, 1908, 1921, 1926, 1930, 1932, 1934, 1936
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -2522,6 +2522,7 @@ YY_RULE_SETUP
 #line 310 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
+    case isc::dhcp::Parser6Context::DHCP6:
     case isc::dhcp::Parser6Context::DHCP_DDNS:
         return isc::dhcp::Dhcp6Parser::make_HOSTNAME_CHAR_SET(driver.loc_);
     default:
@@ -2531,9 +2532,10 @@ YY_RULE_SETUP
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 319 "dhcp6_lexer.ll"
+#line 320 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
+    case isc::dhcp::Parser6Context::DHCP6:
     case isc::dhcp::Parser6Context::DHCP_DDNS:
         return isc::dhcp::Dhcp6Parser::make_HOSTNAME_CHAR_REPLACEMENT(driver.loc_);
     default:
@@ -2543,7 +2545,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 328 "dhcp6_lexer.ll"
+#line 330 "dhcp6_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_PROTOCOL) {
@@ -2556,7 +2558,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 338 "dhcp6_lexer.ll"
+#line 340 "dhcp6_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_PROTOCOL) {
@@ -2569,7 +2571,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 348 "dhcp6_lexer.ll"
+#line 350 "dhcp6_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_FORMAT) {
@@ -2582,7 +2584,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 358 "dhcp6_lexer.ll"
+#line 360 "dhcp6_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) {
@@ -2595,7 +2597,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 368 "dhcp6_lexer.ll"
+#line 370 "dhcp6_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) {
@@ -2608,7 +2610,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 378 "dhcp6_lexer.ll"
+#line 380 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME:
@@ -2620,7 +2622,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 387 "dhcp6_lexer.ll"
+#line 389 "dhcp6_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) {
@@ -2633,7 +2635,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 397 "dhcp6_lexer.ll"
+#line 399 "dhcp6_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) {
@@ -2646,7 +2648,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 407 "dhcp6_lexer.ll"
+#line 409 "dhcp6_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) {
@@ -2659,7 +2661,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 417 "dhcp6_lexer.ll"
+#line 419 "dhcp6_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) {
@@ -2672,7 +2674,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 427 "dhcp6_lexer.ll"
+#line 429 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -2684,7 +2686,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 436 "dhcp6_lexer.ll"
+#line 438 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -2696,7 +2698,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 445 "dhcp6_lexer.ll"
+#line 447 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -2708,7 +2710,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 454 "dhcp6_lexer.ll"
+#line 456 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::INTERFACES_CONFIG:
@@ -2720,7 +2722,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 463 "dhcp6_lexer.ll"
+#line 465 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::INTERFACES_CONFIG:
@@ -2732,7 +2734,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 472 "dhcp6_lexer.ll"
+#line 474 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -2744,7 +2746,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 481 "dhcp6_lexer.ll"
+#line 483 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SANITY_CHECKS:
@@ -2756,7 +2758,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 490 "dhcp6_lexer.ll"
+#line 492 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -2768,7 +2770,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 499 "dhcp6_lexer.ll"
+#line 501 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -2780,7 +2782,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 508 "dhcp6_lexer.ll"
+#line 510 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -2792,7 +2794,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 517 "dhcp6_lexer.ll"
+#line 519 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -2804,7 +2806,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 526 "dhcp6_lexer.ll"
+#line 528 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG_CONTROL:
@@ -2816,7 +2818,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 535 "dhcp6_lexer.ll"
+#line 537 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG_CONTROL:
@@ -2828,7 +2830,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 544 "dhcp6_lexer.ll"
+#line 546 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOSTS_DATABASE:
@@ -2840,7 +2842,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 553 "dhcp6_lexer.ll"
+#line 555 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -2856,7 +2858,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 566 "dhcp6_lexer.ll"
+#line 568 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DATABASE_TYPE:
@@ -2868,7 +2870,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 575 "dhcp6_lexer.ll"
+#line 577 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DATABASE_TYPE:
@@ -2880,7 +2882,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 584 "dhcp6_lexer.ll"
+#line 586 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DATABASE_TYPE:
@@ -2892,7 +2894,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 593 "dhcp6_lexer.ll"
+#line 595 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DATABASE_TYPE:
@@ -2904,7 +2906,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 602 "dhcp6_lexer.ll"
+#line 604 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -2918,7 +2920,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 613 "dhcp6_lexer.ll"
+#line 615 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -2932,7 +2934,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 624 "dhcp6_lexer.ll"
+#line 626 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -2946,7 +2948,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 635 "dhcp6_lexer.ll"
+#line 637 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -2960,7 +2962,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 646 "dhcp6_lexer.ll"
+#line 648 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -2975,7 +2977,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 658 "dhcp6_lexer.ll"
+#line 660 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -2989,7 +2991,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 669 "dhcp6_lexer.ll"
+#line 671 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3003,7 +3005,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 680 "dhcp6_lexer.ll"
+#line 682 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3017,7 +3019,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 691 "dhcp6_lexer.ll"
+#line 693 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3031,7 +3033,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 702 "dhcp6_lexer.ll"
+#line 704 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3045,7 +3047,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 713 "dhcp6_lexer.ll"
+#line 715 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3059,7 +3061,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 724 "dhcp6_lexer.ll"
+#line 726 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3073,7 +3075,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 735 "dhcp6_lexer.ll"
+#line 737 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3087,7 +3089,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 746 "dhcp6_lexer.ll"
+#line 748 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3101,7 +3103,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 757 "dhcp6_lexer.ll"
+#line 759 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3115,7 +3117,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 768 "dhcp6_lexer.ll"
+#line 770 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3129,7 +3131,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 779 "dhcp6_lexer.ll"
+#line 781 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3143,7 +3145,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 790 "dhcp6_lexer.ll"
+#line 792 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3157,7 +3159,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 801 "dhcp6_lexer.ll"
+#line 803 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3171,7 +3173,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 812 "dhcp6_lexer.ll"
+#line 814 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3185,7 +3187,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 823 "dhcp6_lexer.ll"
+#line 825 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3199,7 +3201,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 834 "dhcp6_lexer.ll"
+#line 836 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3213,7 +3215,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 845 "dhcp6_lexer.ll"
+#line 847 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3227,7 +3229,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 856 "dhcp6_lexer.ll"
+#line 858 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3241,7 +3243,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 867 "dhcp6_lexer.ll"
+#line 869 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3253,7 +3255,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 876 "dhcp6_lexer.ll"
+#line 878 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3265,7 +3267,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 885 "dhcp6_lexer.ll"
+#line 887 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3278,7 +3280,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 895 "dhcp6_lexer.ll"
+#line 897 "dhcp6_lexer.ll"
 {
     switch (driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3290,7 +3292,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 904 "dhcp6_lexer.ll"
+#line 906 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3302,7 +3304,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 913 "dhcp6_lexer.ll"
+#line 915 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3320,7 +3322,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 928 "dhcp6_lexer.ll"
+#line 930 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
@@ -3339,7 +3341,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 944 "dhcp6_lexer.ll"
+#line 946 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DATA:
@@ -3351,7 +3353,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 953 "dhcp6_lexer.ll"
+#line 955 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DATA:
@@ -3363,7 +3365,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 962 "dhcp6_lexer.ll"
+#line 964 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3375,7 +3377,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 971 "dhcp6_lexer.ll"
+#line 973 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3387,7 +3389,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 980 "dhcp6_lexer.ll"
+#line 982 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::PD_POOLS:
@@ -3399,7 +3401,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 989 "dhcp6_lexer.ll"
+#line 991 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::PD_POOLS:
@@ -3411,7 +3413,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 998 "dhcp6_lexer.ll"
+#line 1000 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::PD_POOLS:
@@ -3423,7 +3425,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 1007 "dhcp6_lexer.ll"
+#line 1009 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::PD_POOLS:
@@ -3435,7 +3437,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 1016 "dhcp6_lexer.ll"
+#line 1018 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::PD_POOLS:
@@ -3447,7 +3449,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 1025 "dhcp6_lexer.ll"
+#line 1027 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::POOLS:
@@ -3459,7 +3461,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 1034 "dhcp6_lexer.ll"
+#line 1036 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3484,7 +3486,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 1056 "dhcp6_lexer.ll"
+#line 1058 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3509,7 +3511,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 1078 "dhcp6_lexer.ll"
+#line 1080 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3521,7 +3523,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 1087 "dhcp6_lexer.ll"
+#line 1089 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3534,7 +3536,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 1097 "dhcp6_lexer.ll"
+#line 1099 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3547,7 +3549,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 1107 "dhcp6_lexer.ll"
+#line 1109 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3559,7 +3561,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 1116 "dhcp6_lexer.ll"
+#line 1118 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3572,7 +3574,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 1126 "dhcp6_lexer.ll"
+#line 1128 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3586,7 +3588,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 1137 "dhcp6_lexer.ll"
+#line 1139 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3598,7 +3600,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 1146 "dhcp6_lexer.ll"
+#line 1148 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3610,7 +3612,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 1155 "dhcp6_lexer.ll"
+#line 1157 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3622,7 +3624,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 1164 "dhcp6_lexer.ll"
+#line 1166 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3634,7 +3636,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 1173 "dhcp6_lexer.ll"
+#line 1175 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3646,7 +3648,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 1182 "dhcp6_lexer.ll"
+#line 1184 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3659,7 +3661,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 1192 "dhcp6_lexer.ll"
+#line 1194 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3671,7 +3673,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 1201 "dhcp6_lexer.ll"
+#line 1203 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3683,7 +3685,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 1210 "dhcp6_lexer.ll"
+#line 1212 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3695,7 +3697,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 1219 "dhcp6_lexer.ll"
+#line 1221 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3709,7 +3711,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 1230 "dhcp6_lexer.ll"
+#line 1232 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3723,7 +3725,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 1241 "dhcp6_lexer.ll"
+#line 1243 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3737,7 +3739,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 1252 "dhcp6_lexer.ll"
+#line 1254 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -3749,7 +3751,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 1261 "dhcp6_lexer.ll"
+#line 1263 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3762,7 +3764,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 1271 "dhcp6_lexer.ll"
+#line 1273 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGERS:
@@ -3774,7 +3776,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 1280 "dhcp6_lexer.ll"
+#line 1282 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3786,7 +3788,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 1289 "dhcp6_lexer.ll"
+#line 1291 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3798,7 +3800,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 1298 "dhcp6_lexer.ll"
+#line 1300 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3810,7 +3812,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 1307 "dhcp6_lexer.ll"
+#line 1309 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3822,7 +3824,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 1317 "dhcp6_lexer.ll"
+#line 1319 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGERS:
@@ -3834,7 +3836,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 1326 "dhcp6_lexer.ll"
+#line 1328 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGERS:
@@ -3846,7 +3848,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 1335 "dhcp6_lexer.ll"
+#line 1337 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3859,7 +3861,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 1345 "dhcp6_lexer.ll"
+#line 1347 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3874,7 +3876,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 1357 "dhcp6_lexer.ll"
+#line 1359 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3890,7 +3892,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 1370 "dhcp6_lexer.ll"
+#line 1372 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CLIENT_CLASSES:
@@ -3902,7 +3904,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 1379 "dhcp6_lexer.ll"
+#line 1381 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CLIENT_CLASSES:
@@ -3914,7 +3916,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 1388 "dhcp6_lexer.ll"
+#line 1390 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3927,7 +3929,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 1398 "dhcp6_lexer.ll"
+#line 1400 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -3940,7 +3942,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 1408 "dhcp6_lexer.ll"
+#line 1410 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -3952,7 +3954,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 1417 "dhcp6_lexer.ll"
+#line 1419 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::MAC_SOURCES:
@@ -3966,7 +3968,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 1428 "dhcp6_lexer.ll"
+#line 1430 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3979,7 +3981,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 1438 "dhcp6_lexer.ll"
+#line 1440 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -3991,7 +3993,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 1447 "dhcp6_lexer.ll"
+#line 1449 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS:
@@ -4004,7 +4006,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 1457 "dhcp6_lexer.ll"
+#line 1459 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -4017,7 +4019,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 1467 "dhcp6_lexer.ll"
+#line 1469 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DATA:
@@ -4029,7 +4031,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 1476 "dhcp6_lexer.ll"
+#line 1478 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -4041,7 +4043,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 1485 "dhcp6_lexer.ll"
+#line 1487 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -4053,7 +4055,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 1494 "dhcp6_lexer.ll"
+#line 1496 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -4065,7 +4067,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 1503 "dhcp6_lexer.ll"
+#line 1505 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -4078,7 +4080,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 1513 "dhcp6_lexer.ll"
+#line 1515 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RELAY:
@@ -4090,7 +4092,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 1522 "dhcp6_lexer.ll"
+#line 1524 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4102,7 +4104,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 1532 "dhcp6_lexer.ll"
+#line 1534 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOOKS_LIBRARIES:
@@ -4114,7 +4116,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 1541 "dhcp6_lexer.ll"
+#line 1543 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOOKS_LIBRARIES:
@@ -4126,7 +4128,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 1550 "dhcp6_lexer.ll"
+#line 1552 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4138,7 +4140,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 1559 "dhcp6_lexer.ll"
+#line 1561 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -4150,7 +4152,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 1568 "dhcp6_lexer.ll"
+#line 1570 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -4162,7 +4164,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 1577 "dhcp6_lexer.ll"
+#line 1579 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -4174,7 +4176,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 1586 "dhcp6_lexer.ll"
+#line 1588 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -4186,7 +4188,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 1595 "dhcp6_lexer.ll"
+#line 1597 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -4198,7 +4200,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 1604 "dhcp6_lexer.ll"
+#line 1606 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -4210,7 +4212,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 1613 "dhcp6_lexer.ll"
+#line 1615 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -4222,7 +4224,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 1622 "dhcp6_lexer.ll"
+#line 1624 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4234,7 +4236,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 1631 "dhcp6_lexer.ll"
+#line 1633 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4246,7 +4248,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 1640 "dhcp6_lexer.ll"
+#line 1642 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4258,7 +4260,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 1649 "dhcp6_lexer.ll"
+#line 1651 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4270,7 +4272,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 1658 "dhcp6_lexer.ll"
+#line 1660 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4282,7 +4284,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 1667 "dhcp6_lexer.ll"
+#line 1669 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4294,7 +4296,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 1676 "dhcp6_lexer.ll"
+#line 1678 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4306,7 +4308,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 1685 "dhcp6_lexer.ll"
+#line 1687 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4318,7 +4320,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 1694 "dhcp6_lexer.ll"
+#line 1696 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4330,7 +4332,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 1703 "dhcp6_lexer.ll"
+#line 1705 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -4342,7 +4344,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 1712 "dhcp6_lexer.ll"
+#line 1714 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -4354,7 +4356,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 1721 "dhcp6_lexer.ll"
+#line 1723 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4366,7 +4368,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 1730 "dhcp6_lexer.ll"
+#line 1732 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4378,7 +4380,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 1739 "dhcp6_lexer.ll"
+#line 1741 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -4390,7 +4392,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 1748 "dhcp6_lexer.ll"
+#line 1750 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -4402,7 +4404,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 1757 "dhcp6_lexer.ll"
+#line 1759 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -4414,7 +4416,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 1767 "dhcp6_lexer.ll"
+#line 1769 "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.
@@ -4517,7 +4519,7 @@ YY_RULE_SETUP
 case 173:
 /* rule 173 can match eol */
 YY_RULE_SETUP
-#line 1866 "dhcp6_lexer.ll"
+#line 1868 "dhcp6_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
@@ -4526,7 +4528,7 @@ YY_RULE_SETUP
 case 174:
 /* rule 174 can match eol */
 YY_RULE_SETUP
-#line 1871 "dhcp6_lexer.ll"
+#line 1873 "dhcp6_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
@@ -4534,7 +4536,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 1876 "dhcp6_lexer.ll"
+#line 1878 "dhcp6_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
@@ -4542,37 +4544,37 @@ YY_RULE_SETUP
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 1881 "dhcp6_lexer.ll"
+#line 1883 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_LSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 1882 "dhcp6_lexer.ll"
+#line 1884 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_RSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 1883 "dhcp6_lexer.ll"
+#line 1885 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_LCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
-#line 1884 "dhcp6_lexer.ll"
+#line 1886 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_RCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
-#line 1885 "dhcp6_lexer.ll"
+#line 1887 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_COMMA(driver.loc_); }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
-#line 1886 "dhcp6_lexer.ll"
+#line 1888 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_COLON(driver.loc_); }
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
-#line 1888 "dhcp6_lexer.ll"
+#line 1890 "dhcp6_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -4593,7 +4595,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
-#line 1906 "dhcp6_lexer.ll"
+#line 1908 "dhcp6_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -4609,7 +4611,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
-#line 1919 "dhcp6_lexer.ll"
+#line 1921 "dhcp6_lexer.ll"
 {
     string tmp(yytext);
     return isc::dhcp::Dhcp6Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -4617,33 +4619,33 @@ YY_RULE_SETUP
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
-#line 1924 "dhcp6_lexer.ll"
+#line 1926 "dhcp6_lexer.ll"
 {
    return isc::dhcp::Dhcp6Parser::make_NULL_TYPE(driver.loc_);
 }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
-#line 1928 "dhcp6_lexer.ll"
+#line 1930 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
-#line 1930 "dhcp6_lexer.ll"
+#line 1932 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
-#line 1932 "dhcp6_lexer.ll"
+#line 1934 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
-#line 1934 "dhcp6_lexer.ll"
+#line 1936 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1936 "dhcp6_lexer.ll"
+#line 1938 "dhcp6_lexer.ll"
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp6Parser::make_END(driver.loc_);
@@ -4669,10 +4671,10 @@ case YY_STATE_EOF(INITIAL):
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
-#line 1959 "dhcp6_lexer.ll"
+#line 1961 "dhcp6_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 4675 "dhcp6_lexer.cc"
+#line 4677 "dhcp6_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5777,7 +5779,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 1959 "dhcp6_lexer.ll"
+#line 1961 "dhcp6_lexer.ll"
 
 
 using namespace isc::dhcp;
diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc
index 1e6f19687e..3cb9d24354 100644
--- a/src/bin/dhcp6/dhcp6_parser.cc
+++ b/src/bin/dhcp6/dhcp6_parser.cc
@@ -1058,16 +1058,16 @@ namespace isc { namespace dhcp {
 #line 1059 "dhcp6_parser.cc"
     break;
 
-  case 117:
-#line 493 "dhcp6_parser.yy"
+  case 119:
+#line 495 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1067 "dhcp6_parser.cc"
     break;
 
-  case 118:
-#line 495 "dhcp6_parser.yy"
+  case 120:
+#line 497 "dhcp6_parser.yy"
     {
     ElementPtr datadir(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data-directory", datadir);
@@ -1076,8 +1076,8 @@ namespace isc { namespace dhcp {
 #line 1077 "dhcp6_parser.cc"
     break;
 
-  case 119:
-#line 501 "dhcp6_parser.yy"
+  case 121:
+#line 503 "dhcp6_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("preferred-lifetime", prf);
@@ -1085,8 +1085,8 @@ namespace isc { namespace dhcp {
 #line 1086 "dhcp6_parser.cc"
     break;
 
-  case 120:
-#line 506 "dhcp6_parser.yy"
+  case 122:
+#line 508 "dhcp6_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("min-preferred-lifetime", prf);
@@ -1094,8 +1094,8 @@ namespace isc { namespace dhcp {
 #line 1095 "dhcp6_parser.cc"
     break;
 
-  case 121:
-#line 511 "dhcp6_parser.yy"
+  case 123:
+#line 513 "dhcp6_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-preferred-lifetime", prf);
@@ -1103,8 +1103,8 @@ namespace isc { namespace dhcp {
 #line 1104 "dhcp6_parser.cc"
     break;
 
-  case 122:
-#line 516 "dhcp6_parser.yy"
+  case 124:
+#line 518 "dhcp6_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("valid-lifetime", prf);
@@ -1112,8 +1112,8 @@ namespace isc { namespace dhcp {
 #line 1113 "dhcp6_parser.cc"
     break;
 
-  case 123:
-#line 521 "dhcp6_parser.yy"
+  case 125:
+#line 523 "dhcp6_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("min-valid-lifetime", prf);
@@ -1121,8 +1121,8 @@ namespace isc { namespace dhcp {
 #line 1122 "dhcp6_parser.cc"
     break;
 
-  case 124:
-#line 526 "dhcp6_parser.yy"
+  case 126:
+#line 528 "dhcp6_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-valid-lifetime", prf);
@@ -1130,8 +1130,8 @@ namespace isc { namespace dhcp {
 #line 1131 "dhcp6_parser.cc"
     break;
 
-  case 125:
-#line 531 "dhcp6_parser.yy"
+  case 127:
+#line 533 "dhcp6_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("renew-timer", prf);
@@ -1139,8 +1139,8 @@ namespace isc { namespace dhcp {
 #line 1140 "dhcp6_parser.cc"
     break;
 
-  case 126:
-#line 536 "dhcp6_parser.yy"
+  case 128:
+#line 538 "dhcp6_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rebind-timer", prf);
@@ -1148,8 +1148,8 @@ namespace isc { namespace dhcp {
 #line 1149 "dhcp6_parser.cc"
     break;
 
-  case 127:
-#line 541 "dhcp6_parser.yy"
+  case 129:
+#line 543 "dhcp6_parser.yy"
     {
     ElementPtr ctt(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("calculate-tee-times", ctt);
@@ -1157,8 +1157,8 @@ namespace isc { namespace dhcp {
 #line 1158 "dhcp6_parser.cc"
     break;
 
-  case 128:
-#line 546 "dhcp6_parser.yy"
+  case 130:
+#line 548 "dhcp6_parser.yy"
     {
     ElementPtr t1(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("t1-percent", t1);
@@ -1166,8 +1166,8 @@ namespace isc { namespace dhcp {
 #line 1167 "dhcp6_parser.cc"
     break;
 
-  case 129:
-#line 551 "dhcp6_parser.yy"
+  case 131:
+#line 553 "dhcp6_parser.yy"
     {
     ElementPtr t2(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("t2-percent", t2);
@@ -1175,8 +1175,8 @@ namespace isc { namespace dhcp {
 #line 1176 "dhcp6_parser.cc"
     break;
 
-  case 130:
-#line 556 "dhcp6_parser.yy"
+  case 132:
+#line 558 "dhcp6_parser.yy"
     {
     ElementPtr dpp(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("decline-probation-period", dpp);
@@ -1184,16 +1184,16 @@ namespace isc { namespace dhcp {
 #line 1185 "dhcp6_parser.cc"
     break;
 
-  case 131:
-#line 561 "dhcp6_parser.yy"
+  case 133:
+#line 563 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1193 "dhcp6_parser.cc"
     break;
 
-  case 132:
-#line 563 "dhcp6_parser.yy"
+  case 134:
+#line 565 "dhcp6_parser.yy"
     {
     ElementPtr stag(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-tag", stag);
@@ -1202,8 +1202,8 @@ namespace isc { namespace dhcp {
 #line 1203 "dhcp6_parser.cc"
     break;
 
-  case 133:
-#line 569 "dhcp6_parser.yy"
+  case 135:
+#line 571 "dhcp6_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces-config", i);
@@ -1213,8 +1213,8 @@ namespace isc { namespace dhcp {
 #line 1214 "dhcp6_parser.cc"
     break;
 
-  case 134:
-#line 574 "dhcp6_parser.yy"
+  case 136:
+#line 576 "dhcp6_parser.yy"
     {
     // No interfaces config param is required
     ctx.stack_.pop_back();
@@ -1223,8 +1223,8 @@ namespace isc { namespace dhcp {
 #line 1224 "dhcp6_parser.cc"
     break;
 
-  case 135:
-#line 580 "dhcp6_parser.yy"
+  case 137:
+#line 582 "dhcp6_parser.yy"
     {
     // Parse the interfaces-config map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1233,8 +1233,8 @@ namespace isc { namespace dhcp {
 #line 1234 "dhcp6_parser.cc"
     break;
 
-  case 136:
-#line 584 "dhcp6_parser.yy"
+  case 138:
+#line 586 "dhcp6_parser.yy"
     {
     // No interfaces config param is required
     // parsing completed
@@ -1242,8 +1242,8 @@ namespace isc { namespace dhcp {
 #line 1243 "dhcp6_parser.cc"
     break;
 
-  case 144:
-#line 600 "dhcp6_parser.yy"
+  case 146:
+#line 602 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces", l);
@@ -1253,8 +1253,8 @@ namespace isc { namespace dhcp {
 #line 1254 "dhcp6_parser.cc"
     break;
 
-  case 145:
-#line 605 "dhcp6_parser.yy"
+  case 147:
+#line 607 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1262,8 +1262,8 @@ namespace isc { namespace dhcp {
 #line 1263 "dhcp6_parser.cc"
     break;
 
-  case 146:
-#line 610 "dhcp6_parser.yy"
+  case 148:
+#line 612 "dhcp6_parser.yy"
     {
     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 "dhcp6_parser.cc"
     break;
 
-  case 147:
-#line 616 "dhcp6_parser.yy"
+  case 149:
+#line 618 "dhcp6_parser.yy"
     {
     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 "dhcp6_parser.cc"
     break;
 
-  case 148:
-#line 621 "dhcp6_parser.yy"
+  case 150:
+#line 623 "dhcp6_parser.yy"
     {
     // 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 "dhcp6_parser.cc"
     break;
 
-  case 149:
-#line 628 "dhcp6_parser.yy"
+  case 151:
+#line 630 "dhcp6_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-database", i);
@@ -1304,8 +1304,8 @@ namespace isc { namespace dhcp {
 #line 1305 "dhcp6_parser.cc"
     break;
 
-  case 150:
-#line 633 "dhcp6_parser.yy"
+  case 152:
+#line 635 "dhcp6_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1315,8 +1315,8 @@ namespace isc { namespace dhcp {
 #line 1316 "dhcp6_parser.cc"
     break;
 
-  case 151:
-#line 640 "dhcp6_parser.yy"
+  case 153:
+#line 642 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-databases", l);
@@ -1326,8 +1326,8 @@ namespace isc { namespace dhcp {
 #line 1327 "dhcp6_parser.cc"
     break;
 
-  case 152:
-#line 645 "dhcp6_parser.yy"
+  case 154:
+#line 647 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1335,8 +1335,8 @@ namespace isc { namespace dhcp {
 #line 1336 "dhcp6_parser.cc"
     break;
 
-  case 157:
-#line 658 "dhcp6_parser.yy"
+  case 159:
+#line 660 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1345,8 +1345,8 @@ namespace isc { namespace dhcp {
 #line 1346 "dhcp6_parser.cc"
     break;
 
-  case 158:
-#line 662 "dhcp6_parser.yy"
+  case 160:
+#line 664 "dhcp6_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1355,16 +1355,16 @@ namespace isc { namespace dhcp {
 #line 1356 "dhcp6_parser.cc"
     break;
 
-  case 181:
-#line 694 "dhcp6_parser.yy"
+  case 183:
+#line 696 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.DATABASE_TYPE);
 }
 #line 1364 "dhcp6_parser.cc"
     break;
 
-  case 182:
-#line 696 "dhcp6_parser.yy"
+  case 184:
+#line 698 "dhcp6_parser.yy"
     {
     ctx.stack_.back()->set("type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -1372,40 +1372,40 @@ namespace isc { namespace dhcp {
 #line 1373 "dhcp6_parser.cc"
     break;
 
-  case 183:
-#line 701 "dhcp6_parser.yy"
+  case 185:
+#line 703 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); }
 #line 1379 "dhcp6_parser.cc"
     break;
 
-  case 184:
-#line 702 "dhcp6_parser.yy"
+  case 186:
+#line 704 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); }
 #line 1385 "dhcp6_parser.cc"
     break;
 
-  case 185:
-#line 703 "dhcp6_parser.yy"
+  case 187:
+#line 705 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); }
 #line 1391 "dhcp6_parser.cc"
     break;
 
-  case 186:
-#line 704 "dhcp6_parser.yy"
+  case 188:
+#line 706 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); }
 #line 1397 "dhcp6_parser.cc"
     break;
 
-  case 187:
-#line 707 "dhcp6_parser.yy"
+  case 189:
+#line 709 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1405 "dhcp6_parser.cc"
     break;
 
-  case 188:
-#line 709 "dhcp6_parser.yy"
+  case 190:
+#line 711 "dhcp6_parser.yy"
     {
     ElementPtr user(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user", user);
@@ -1414,16 +1414,16 @@ namespace isc { namespace dhcp {
 #line 1415 "dhcp6_parser.cc"
     break;
 
-  case 189:
-#line 715 "dhcp6_parser.yy"
+  case 191:
+#line 717 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1423 "dhcp6_parser.cc"
     break;
 
-  case 190:
-#line 717 "dhcp6_parser.yy"
+  case 192:
+#line 719 "dhcp6_parser.yy"
     {
     ElementPtr pwd(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password", pwd);
@@ -1432,16 +1432,16 @@ namespace isc { namespace dhcp {
 #line 1433 "dhcp6_parser.cc"
     break;
 
-  case 191:
-#line 723 "dhcp6_parser.yy"
+  case 193:
+#line 725 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1441 "dhcp6_parser.cc"
     break;
 
-  case 192:
-#line 725 "dhcp6_parser.yy"
+  case 194:
+#line 727 "dhcp6_parser.yy"
     {
     ElementPtr h(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host", h);
@@ -1450,8 +1450,8 @@ namespace isc { namespace dhcp {
 #line 1451 "dhcp6_parser.cc"
     break;
 
-  case 193:
-#line 731 "dhcp6_parser.yy"
+  case 195:
+#line 733 "dhcp6_parser.yy"
     {
     ElementPtr p(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", p);
@@ -1459,16 +1459,16 @@ namespace isc { namespace dhcp {
 #line 1460 "dhcp6_parser.cc"
     break;
 
-  case 194:
-#line 736 "dhcp6_parser.yy"
+  case 196:
+#line 738 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1468 "dhcp6_parser.cc"
     break;
 
-  case 195:
-#line 738 "dhcp6_parser.yy"
+  case 197:
+#line 740 "dhcp6_parser.yy"
     {
     ElementPtr name(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
@@ -1477,8 +1477,8 @@ namespace isc { namespace dhcp {
 #line 1478 "dhcp6_parser.cc"
     break;
 
-  case 196:
-#line 744 "dhcp6_parser.yy"
+  case 198:
+#line 746 "dhcp6_parser.yy"
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("persist", n);
@@ -1486,8 +1486,8 @@ namespace isc { namespace dhcp {
 #line 1487 "dhcp6_parser.cc"
     break;
 
-  case 197:
-#line 749 "dhcp6_parser.yy"
+  case 199:
+#line 751 "dhcp6_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lfc-interval", n);
@@ -1495,8 +1495,8 @@ namespace isc { namespace dhcp {
 #line 1496 "dhcp6_parser.cc"
     break;
 
-  case 198:
-#line 754 "dhcp6_parser.yy"
+  case 200:
+#line 756 "dhcp6_parser.yy"
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("readonly", n);
@@ -1504,8 +1504,8 @@ namespace isc { namespace dhcp {
 #line 1505 "dhcp6_parser.cc"
     break;
 
-  case 199:
-#line 759 "dhcp6_parser.yy"
+  case 201:
+#line 761 "dhcp6_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("connect-timeout", n);
@@ -1513,8 +1513,8 @@ namespace isc { namespace dhcp {
 #line 1514 "dhcp6_parser.cc"
     break;
 
-  case 200:
-#line 764 "dhcp6_parser.yy"
+  case 202:
+#line 766 "dhcp6_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reconnect-wait-time", n);
@@ -1522,8 +1522,8 @@ namespace isc { namespace dhcp {
 #line 1523 "dhcp6_parser.cc"
     break;
 
-  case 201:
-#line 769 "dhcp6_parser.yy"
+  case 203:
+#line 771 "dhcp6_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("request-timeout", n);
@@ -1531,8 +1531,8 @@ namespace isc { namespace dhcp {
 #line 1532 "dhcp6_parser.cc"
     break;
 
-  case 202:
-#line 774 "dhcp6_parser.yy"
+  case 204:
+#line 776 "dhcp6_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-keepalive", n);
@@ -1540,8 +1540,8 @@ namespace isc { namespace dhcp {
 #line 1541 "dhcp6_parser.cc"
     break;
 
-  case 203:
-#line 779 "dhcp6_parser.yy"
+  case 205:
+#line 781 "dhcp6_parser.yy"
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-nodelay", n);
@@ -1549,16 +1549,16 @@ namespace isc { namespace dhcp {
 #line 1550 "dhcp6_parser.cc"
     break;
 
-  case 204:
-#line 784 "dhcp6_parser.yy"
+  case 206:
+#line 786 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1558 "dhcp6_parser.cc"
     break;
 
-  case 205:
-#line 786 "dhcp6_parser.yy"
+  case 207:
+#line 788 "dhcp6_parser.yy"
     {
     ElementPtr cp(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("contact-points", cp);
@@ -1567,8 +1567,8 @@ namespace isc { namespace dhcp {
 #line 1568 "dhcp6_parser.cc"
     break;
 
-  case 206:
-#line 792 "dhcp6_parser.yy"
+  case 208:
+#line 794 "dhcp6_parser.yy"
     {
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reconnect-tries", n);
@@ -1576,16 +1576,16 @@ namespace isc { namespace dhcp {
 #line 1577 "dhcp6_parser.cc"
     break;
 
-  case 207:
-#line 797 "dhcp6_parser.yy"
+  case 209:
+#line 799 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1585 "dhcp6_parser.cc"
     break;
 
-  case 208:
-#line 799 "dhcp6_parser.yy"
+  case 210:
+#line 801 "dhcp6_parser.yy"
     {
     ElementPtr ks(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("keyspace", ks);
@@ -1594,16 +1594,16 @@ namespace isc { namespace dhcp {
 #line 1595 "dhcp6_parser.cc"
     break;
 
-  case 209:
-#line 805 "dhcp6_parser.yy"
+  case 211:
+#line 807 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1603 "dhcp6_parser.cc"
     break;
 
-  case 210:
-#line 807 "dhcp6_parser.yy"
+  case 212:
+#line 809 "dhcp6_parser.yy"
     {
     ElementPtr c(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("consistency", c);
@@ -1612,16 +1612,16 @@ namespace isc { namespace dhcp {
 #line 1613 "dhcp6_parser.cc"
     break;
 
-  case 211:
-#line 813 "dhcp6_parser.yy"
+  case 213:
+#line 815 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1621 "dhcp6_parser.cc"
     break;
 
-  case 212:
-#line 815 "dhcp6_parser.yy"
+  case 214:
+#line 817 "dhcp6_parser.yy"
     {
     ElementPtr c(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("serial-consistency", c);
@@ -1630,8 +1630,8 @@ namespace isc { namespace dhcp {
 #line 1631 "dhcp6_parser.cc"
     break;
 
-  case 213:
-#line 821 "dhcp6_parser.yy"
+  case 215:
+#line 823 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sanity-checks", m);
@@ -1641,8 +1641,8 @@ namespace isc { namespace dhcp {
 #line 1642 "dhcp6_parser.cc"
     break;
 
-  case 214:
-#line 826 "dhcp6_parser.yy"
+  case 216:
+#line 828 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1650,16 +1650,16 @@ namespace isc { namespace dhcp {
 #line 1651 "dhcp6_parser.cc"
     break;
 
-  case 218:
-#line 836 "dhcp6_parser.yy"
+  case 220:
+#line 838 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1659 "dhcp6_parser.cc"
     break;
 
-  case 219:
-#line 838 "dhcp6_parser.yy"
+  case 221:
+#line 840 "dhcp6_parser.yy"
     {
 
     if ( (string(yystack_[0].value.as < std::string > ()) == "none") ||
@@ -1678,8 +1678,8 @@ namespace isc { namespace dhcp {
 #line 1679 "dhcp6_parser.cc"
     break;
 
-  case 220:
-#line 854 "dhcp6_parser.yy"
+  case 222:
+#line 856 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("mac-sources", l);
@@ -1689,8 +1689,8 @@ namespace isc { namespace dhcp {
 #line 1690 "dhcp6_parser.cc"
     break;
 
-  case 221:
-#line 859 "dhcp6_parser.yy"
+  case 223:
+#line 861 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1698,8 +1698,8 @@ namespace isc { namespace dhcp {
 #line 1699 "dhcp6_parser.cc"
     break;
 
-  case 226:
-#line 872 "dhcp6_parser.yy"
+  case 228:
+#line 874 "dhcp6_parser.yy"
     {
     ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
@@ -1707,8 +1707,8 @@ namespace isc { namespace dhcp {
 #line 1708 "dhcp6_parser.cc"
     break;
 
-  case 227:
-#line 877 "dhcp6_parser.yy"
+  case 229:
+#line 879 "dhcp6_parser.yy"
     {
     ElementPtr duid(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
@@ -1716,8 +1716,8 @@ namespace isc { namespace dhcp {
 #line 1717 "dhcp6_parser.cc"
     break;
 
-  case 228:
-#line 882 "dhcp6_parser.yy"
+  case 230:
+#line 884 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host-reservation-identifiers", l);
@@ -1727,8 +1727,8 @@ namespace isc { namespace dhcp {
 #line 1728 "dhcp6_parser.cc"
     break;
 
-  case 229:
-#line 887 "dhcp6_parser.yy"
+  case 231:
+#line 889 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1736,8 +1736,8 @@ namespace isc { namespace dhcp {
 #line 1737 "dhcp6_parser.cc"
     break;
 
-  case 235:
-#line 901 "dhcp6_parser.yy"
+  case 237:
+#line 903 "dhcp6_parser.yy"
     {
     ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(hwaddr);
@@ -1745,8 +1745,8 @@ namespace isc { namespace dhcp {
 #line 1746 "dhcp6_parser.cc"
     break;
 
-  case 236:
-#line 906 "dhcp6_parser.yy"
+  case 238:
+#line 908 "dhcp6_parser.yy"
     {
     ElementPtr flex_id(new StringElement("flex-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(flex_id);
@@ -1754,8 +1754,8 @@ namespace isc { namespace dhcp {
 #line 1755 "dhcp6_parser.cc"
     break;
 
-  case 237:
-#line 913 "dhcp6_parser.yy"
+  case 239:
+#line 915 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay-supplied-options", l);
@@ -1765,8 +1765,8 @@ namespace isc { namespace dhcp {
 #line 1766 "dhcp6_parser.cc"
     break;
 
-  case 238:
-#line 918 "dhcp6_parser.yy"
+  case 240:
+#line 920 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1774,8 +1774,8 @@ namespace isc { namespace dhcp {
 #line 1775 "dhcp6_parser.cc"
     break;
 
-  case 239:
-#line 923 "dhcp6_parser.yy"
+  case 241:
+#line 925 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hooks-libraries", l);
@@ -1785,8 +1785,8 @@ namespace isc { namespace dhcp {
 #line 1786 "dhcp6_parser.cc"
     break;
 
-  case 240:
-#line 928 "dhcp6_parser.yy"
+  case 242:
+#line 930 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1794,8 +1794,8 @@ namespace isc { namespace dhcp {
 #line 1795 "dhcp6_parser.cc"
     break;
 
-  case 245:
-#line 941 "dhcp6_parser.yy"
+  case 247:
+#line 943 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1804,8 +1804,8 @@ namespace isc { namespace dhcp {
 #line 1805 "dhcp6_parser.cc"
     break;
 
-  case 246:
-#line 945 "dhcp6_parser.yy"
+  case 248:
+#line 947 "dhcp6_parser.yy"
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1814,8 +1814,8 @@ namespace isc { namespace dhcp {
 #line 1815 "dhcp6_parser.cc"
     break;
 
-  case 247:
-#line 951 "dhcp6_parser.yy"
+  case 249:
+#line 953 "dhcp6_parser.yy"
     {
     // Parse the hooks-libraries list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1824,8 +1824,8 @@ namespace isc { namespace dhcp {
 #line 1825 "dhcp6_parser.cc"
     break;
 
-  case 248:
-#line 955 "dhcp6_parser.yy"
+  case 250:
+#line 957 "dhcp6_parser.yy"
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1834,16 +1834,16 @@ namespace isc { namespace dhcp {
 #line 1835 "dhcp6_parser.cc"
     break;
 
-  case 254:
-#line 970 "dhcp6_parser.yy"
+  case 256:
+#line 972 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1843 "dhcp6_parser.cc"
     break;
 
-  case 255:
-#line 972 "dhcp6_parser.yy"
+  case 257:
+#line 974 "dhcp6_parser.yy"
     {
     ElementPtr lib(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("library", lib);
@@ -1852,16 +1852,16 @@ namespace isc { namespace dhcp {
 #line 1853 "dhcp6_parser.cc"
     break;
 
-  case 256:
-#line 978 "dhcp6_parser.yy"
+  case 258:
+#line 980 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 1861 "dhcp6_parser.cc"
     break;
 
-  case 257:
-#line 980 "dhcp6_parser.yy"
+  case 259:
+#line 982 "dhcp6_parser.yy"
     {
     ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -1869,8 +1869,8 @@ namespace isc { namespace dhcp {
 #line 1870 "dhcp6_parser.cc"
     break;
 
-  case 258:
-#line 986 "dhcp6_parser.yy"
+  case 260:
+#line 988 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("expired-leases-processing", m);
@@ -1880,8 +1880,8 @@ namespace isc { namespace dhcp {
 #line 1881 "dhcp6_parser.cc"
     break;
 
-  case 259:
-#line 991 "dhcp6_parser.yy"
+  case 261:
+#line 993 "dhcp6_parser.yy"
     {
     // No expired lease parameter is required
     ctx.stack_.pop_back();
@@ -1890,8 +1890,8 @@ namespace isc { namespace dhcp {
 #line 1891 "dhcp6_parser.cc"
     break;
 
-  case 268:
-#line 1009 "dhcp6_parser.yy"
+  case 270:
+#line 1011 "dhcp6_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reclaim-timer-wait-time", value);
@@ -1899,8 +1899,8 @@ namespace isc { namespace dhcp {
 #line 1900 "dhcp6_parser.cc"
     break;
 
-  case 269:
-#line 1014 "dhcp6_parser.yy"
+  case 271:
+#line 1016 "dhcp6_parser.yy"
     {
     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);
@@ -1908,8 +1908,8 @@ namespace isc { namespace dhcp {
 #line 1909 "dhcp6_parser.cc"
     break;
 
-  case 270:
-#line 1019 "dhcp6_parser.yy"
+  case 272:
+#line 1021 "dhcp6_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hold-reclaimed-time", value);
@@ -1917,8 +1917,8 @@ namespace isc { namespace dhcp {
 #line 1918 "dhcp6_parser.cc"
     break;
 
-  case 271:
-#line 1024 "dhcp6_parser.yy"
+  case 273:
+#line 1026 "dhcp6_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-leases", value);
@@ -1926,8 +1926,8 @@ namespace isc { namespace dhcp {
 #line 1927 "dhcp6_parser.cc"
     break;
 
-  case 272:
-#line 1029 "dhcp6_parser.yy"
+  case 274:
+#line 1031 "dhcp6_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-time", value);
@@ -1935,8 +1935,8 @@ namespace isc { namespace dhcp {
 #line 1936 "dhcp6_parser.cc"
     break;
 
-  case 273:
-#line 1034 "dhcp6_parser.yy"
+  case 275:
+#line 1036 "dhcp6_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("unwarned-reclaim-cycles", value);
@@ -1944,8 +1944,8 @@ namespace isc { namespace dhcp {
 #line 1945 "dhcp6_parser.cc"
     break;
 
-  case 274:
-#line 1042 "dhcp6_parser.yy"
+  case 276:
+#line 1044 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet6", l);
@@ -1955,8 +1955,8 @@ namespace isc { namespace dhcp {
 #line 1956 "dhcp6_parser.cc"
     break;
 
-  case 275:
-#line 1047 "dhcp6_parser.yy"
+  case 277:
+#line 1049 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1964,8 +1964,8 @@ namespace isc { namespace dhcp {
 #line 1965 "dhcp6_parser.cc"
     break;
 
-  case 280:
-#line 1067 "dhcp6_parser.yy"
+  case 282:
+#line 1069 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1974,8 +1974,8 @@ namespace isc { namespace dhcp {
 #line 1975 "dhcp6_parser.cc"
     break;
 
-  case 281:
-#line 1071 "dhcp6_parser.yy"
+  case 283:
+#line 1073 "dhcp6_parser.yy"
     {
     // Once we reached this place, the subnet parsing is now complete.
     // If we want to, we can implement default values here.
@@ -2000,8 +2000,8 @@ namespace isc { namespace dhcp {
 #line 2001 "dhcp6_parser.cc"
     break;
 
-  case 282:
-#line 1093 "dhcp6_parser.yy"
+  case 284:
+#line 1095 "dhcp6_parser.yy"
     {
     // Parse the subnet6 list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2010,8 +2010,8 @@ namespace isc { namespace dhcp {
 #line 2011 "dhcp6_parser.cc"
     break;
 
-  case 283:
-#line 1097 "dhcp6_parser.yy"
+  case 285:
+#line 1099 "dhcp6_parser.yy"
     {
     // The subnet subnet6 parameter is required
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2020,16 +2020,16 @@ namespace isc { namespace dhcp {
 #line 2021 "dhcp6_parser.cc"
     break;
 
-  case 313:
-#line 1138 "dhcp6_parser.yy"
+  case 315:
+#line 1140 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2029 "dhcp6_parser.cc"
     break;
 
-  case 314:
-#line 1140 "dhcp6_parser.yy"
+  case 316:
+#line 1142 "dhcp6_parser.yy"
     {
     ElementPtr subnet(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet", subnet);
@@ -2038,16 +2038,16 @@ namespace isc { namespace dhcp {
 #line 2039 "dhcp6_parser.cc"
     break;
 
-  case 315:
-#line 1146 "dhcp6_parser.yy"
+  case 317:
+#line 1148 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2047 "dhcp6_parser.cc"
     break;
 
-  case 316:
-#line 1148 "dhcp6_parser.yy"
+  case 318:
+#line 1150 "dhcp6_parser.yy"
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface", iface);
@@ -2056,16 +2056,16 @@ namespace isc { namespace dhcp {
 #line 2057 "dhcp6_parser.cc"
     break;
 
-  case 317:
-#line 1154 "dhcp6_parser.yy"
+  case 319:
+#line 1156 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2065 "dhcp6_parser.cc"
     break;
 
-  case 318:
-#line 1156 "dhcp6_parser.yy"
+  case 320:
+#line 1158 "dhcp6_parser.yy"
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface-id", iface);
@@ -2074,16 +2074,16 @@ namespace isc { namespace dhcp {
 #line 2075 "dhcp6_parser.cc"
     break;
 
-  case 319:
-#line 1162 "dhcp6_parser.yy"
+  case 321:
+#line 1164 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2083 "dhcp6_parser.cc"
     break;
 
-  case 320:
-#line 1164 "dhcp6_parser.yy"
+  case 322:
+#line 1166 "dhcp6_parser.yy"
     {
     ElementPtr cls(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-class", cls);
@@ -2092,8 +2092,8 @@ namespace isc { namespace dhcp {
 #line 2093 "dhcp6_parser.cc"
     break;
 
-  case 321:
-#line 1170 "dhcp6_parser.yy"
+  case 323:
+#line 1172 "dhcp6_parser.yy"
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("require-client-classes", c);
@@ -2103,8 +2103,8 @@ namespace isc { namespace dhcp {
 #line 2104 "dhcp6_parser.cc"
     break;
 
-  case 322:
-#line 1175 "dhcp6_parser.yy"
+  case 324:
+#line 1177 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2112,16 +2112,16 @@ namespace isc { namespace dhcp {
 #line 2113 "dhcp6_parser.cc"
     break;
 
-  case 323:
-#line 1180 "dhcp6_parser.yy"
+  case 325:
+#line 1182 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.RESERVATION_MODE);
 }
 #line 2121 "dhcp6_parser.cc"
     break;
 
-  case 324:
-#line 1182 "dhcp6_parser.yy"
+  case 326:
+#line 1184 "dhcp6_parser.yy"
     {
     ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -2129,32 +2129,32 @@ namespace isc { namespace dhcp {
 #line 2130 "dhcp6_parser.cc"
     break;
 
-  case 325:
-#line 1187 "dhcp6_parser.yy"
+  case 327:
+#line 1189 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); }
 #line 2136 "dhcp6_parser.cc"
     break;
 
-  case 326:
-#line 1188 "dhcp6_parser.yy"
+  case 328:
+#line 1190 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); }
 #line 2142 "dhcp6_parser.cc"
     break;
 
-  case 327:
-#line 1189 "dhcp6_parser.yy"
+  case 329:
+#line 1191 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("global", ctx.loc2pos(yystack_[0].location))); }
 #line 2148 "dhcp6_parser.cc"
     break;
 
-  case 328:
-#line 1190 "dhcp6_parser.yy"
+  case 330:
+#line 1192 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); }
 #line 2154 "dhcp6_parser.cc"
     break;
 
-  case 329:
-#line 1193 "dhcp6_parser.yy"
+  case 331:
+#line 1195 "dhcp6_parser.yy"
     {
     ElementPtr id(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("id", id);
@@ -2162,8 +2162,8 @@ namespace isc { namespace dhcp {
 #line 2163 "dhcp6_parser.cc"
     break;
 
-  case 330:
-#line 1198 "dhcp6_parser.yy"
+  case 332:
+#line 1200 "dhcp6_parser.yy"
     {
     ElementPtr rc(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rapid-commit", rc);
@@ -2171,8 +2171,8 @@ namespace isc { namespace dhcp {
 #line 2172 "dhcp6_parser.cc"
     break;
 
-  case 331:
-#line 1206 "dhcp6_parser.yy"
+  case 333:
+#line 1208 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("shared-networks", l);
@@ -2182,8 +2182,8 @@ namespace isc { namespace dhcp {
 #line 2183 "dhcp6_parser.cc"
     break;
 
-  case 332:
-#line 1211 "dhcp6_parser.yy"
+  case 334:
+#line 1213 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2191,8 +2191,8 @@ namespace isc { namespace dhcp {
 #line 2192 "dhcp6_parser.cc"
     break;
 
-  case 337:
-#line 1226 "dhcp6_parser.yy"
+  case 339:
+#line 1228 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2201,16 +2201,16 @@ namespace isc { namespace dhcp {
 #line 2202 "dhcp6_parser.cc"
     break;
 
-  case 338:
-#line 1230 "dhcp6_parser.yy"
+  case 340:
+#line 1232 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
 }
 #line 2210 "dhcp6_parser.cc"
     break;
 
-  case 365:
-#line 1268 "dhcp6_parser.yy"
+  case 367:
+#line 1270 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-def", l);
@@ -2220,8 +2220,8 @@ namespace isc { namespace dhcp {
 #line 2221 "dhcp6_parser.cc"
     break;
 
-  case 366:
-#line 1273 "dhcp6_parser.yy"
+  case 368:
+#line 1275 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2229,8 +2229,8 @@ namespace isc { namespace dhcp {
 #line 2230 "dhcp6_parser.cc"
     break;
 
-  case 367:
-#line 1281 "dhcp6_parser.yy"
+  case 369:
+#line 1283 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
@@ -2238,16 +2238,16 @@ namespace isc { namespace dhcp {
 #line 2239 "dhcp6_parser.cc"
     break;
 
-  case 368:
-#line 1284 "dhcp6_parser.yy"
+  case 370:
+#line 1286 "dhcp6_parser.yy"
     {
     // parsing completed
 }
 #line 2247 "dhcp6_parser.cc"
     break;
 
-  case 373:
-#line 1300 "dhcp6_parser.yy"
+  case 375:
+#line 1302 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2256,8 +2256,8 @@ namespace isc { namespace dhcp {
 #line 2257 "dhcp6_parser.cc"
     break;
 
-  case 374:
-#line 1304 "dhcp6_parser.yy"
+  case 376:
+#line 1306 "dhcp6_parser.yy"
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2268,8 +2268,8 @@ namespace isc { namespace dhcp {
 #line 2269 "dhcp6_parser.cc"
     break;
 
-  case 375:
-#line 1315 "dhcp6_parser.yy"
+  case 377:
+#line 1317 "dhcp6_parser.yy"
     {
     // Parse the option-def list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2278,8 +2278,8 @@ namespace isc { namespace dhcp {
 #line 2279 "dhcp6_parser.cc"
     break;
 
-  case 376:
-#line 1319 "dhcp6_parser.yy"
+  case 378:
+#line 1321 "dhcp6_parser.yy"
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2290,8 +2290,8 @@ namespace isc { namespace dhcp {
 #line 2291 "dhcp6_parser.cc"
     break;
 
-  case 392:
-#line 1351 "dhcp6_parser.yy"
+  case 394:
+#line 1353 "dhcp6_parser.yy"
     {
     ElementPtr code(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("code", code);
@@ -2299,16 +2299,16 @@ namespace isc { namespace dhcp {
 #line 2300 "dhcp6_parser.cc"
     break;
 
-  case 394:
-#line 1358 "dhcp6_parser.yy"
+  case 396:
+#line 1360 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2308 "dhcp6_parser.cc"
     break;
 
-  case 395:
-#line 1360 "dhcp6_parser.yy"
+  case 397:
+#line 1362 "dhcp6_parser.yy"
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("type", prf);
@@ -2317,16 +2317,16 @@ namespace isc { namespace dhcp {
 #line 2318 "dhcp6_parser.cc"
     break;
 
-  case 396:
-#line 1366 "dhcp6_parser.yy"
+  case 398:
+#line 1368 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2326 "dhcp6_parser.cc"
     break;
 
-  case 397:
-#line 1368 "dhcp6_parser.yy"
+  case 399:
+#line 1370 "dhcp6_parser.yy"
     {
     ElementPtr rtypes(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("record-types", rtypes);
@@ -2335,16 +2335,16 @@ namespace isc { namespace dhcp {
 #line 2336 "dhcp6_parser.cc"
     break;
 
-  case 398:
-#line 1374 "dhcp6_parser.yy"
+  case 400:
+#line 1376 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2344 "dhcp6_parser.cc"
     break;
 
-  case 399:
-#line 1376 "dhcp6_parser.yy"
+  case 401:
+#line 1378 "dhcp6_parser.yy"
     {
     ElementPtr space(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("space", space);
@@ -2353,16 +2353,16 @@ namespace isc { namespace dhcp {
 #line 2354 "dhcp6_parser.cc"
     break;
 
-  case 401:
-#line 1384 "dhcp6_parser.yy"
+  case 403:
+#line 1386 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2362 "dhcp6_parser.cc"
     break;
 
-  case 402:
-#line 1386 "dhcp6_parser.yy"
+  case 404:
+#line 1388 "dhcp6_parser.yy"
     {
     ElementPtr encap(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("encapsulate", encap);
@@ -2371,8 +2371,8 @@ namespace isc { namespace dhcp {
 #line 2372 "dhcp6_parser.cc"
     break;
 
-  case 403:
-#line 1392 "dhcp6_parser.yy"
+  case 405:
+#line 1394 "dhcp6_parser.yy"
     {
     ElementPtr array(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("array", array);
@@ -2380,8 +2380,8 @@ namespace isc { namespace dhcp {
 #line 2381 "dhcp6_parser.cc"
     break;
 
-  case 404:
-#line 1401 "dhcp6_parser.yy"
+  case 406:
+#line 1403 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-data", l);
@@ -2391,8 +2391,8 @@ namespace isc { namespace dhcp {
 #line 2392 "dhcp6_parser.cc"
     break;
 
-  case 405:
-#line 1406 "dhcp6_parser.yy"
+  case 407:
+#line 1408 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2400,8 +2400,8 @@ namespace isc { namespace dhcp {
 #line 2401 "dhcp6_parser.cc"
     break;
 
-  case 410:
-#line 1425 "dhcp6_parser.yy"
+  case 412:
+#line 1427 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2410,8 +2410,8 @@ namespace isc { namespace dhcp {
 #line 2411 "dhcp6_parser.cc"
     break;
 
-  case 411:
-#line 1429 "dhcp6_parser.yy"
+  case 413:
+#line 1431 "dhcp6_parser.yy"
     {
     /// @todo: the code or name parameters are required.
     ctx.stack_.pop_back();
@@ -2419,8 +2419,8 @@ namespace isc { namespace dhcp {
 #line 2420 "dhcp6_parser.cc"
     break;
 
-  case 412:
-#line 1437 "dhcp6_parser.yy"
+  case 414:
+#line 1439 "dhcp6_parser.yy"
     {
     // Parse the option-data list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2429,8 +2429,8 @@ namespace isc { namespace dhcp {
 #line 2430 "dhcp6_parser.cc"
     break;
 
-  case 413:
-#line 1441 "dhcp6_parser.yy"
+  case 415:
+#line 1443 "dhcp6_parser.yy"
     {
     /// @todo: the code or name parameters are required.
     // parsing completed
@@ -2438,16 +2438,16 @@ namespace isc { namespace dhcp {
 #line 2439 "dhcp6_parser.cc"
     break;
 
-  case 428:
-#line 1474 "dhcp6_parser.yy"
+  case 430:
+#line 1476 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2447 "dhcp6_parser.cc"
     break;
 
-  case 429:
-#line 1476 "dhcp6_parser.yy"
+  case 431:
+#line 1478 "dhcp6_parser.yy"
     {
     ElementPtr data(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
@@ -2456,8 +2456,8 @@ namespace isc { namespace dhcp {
 #line 2457 "dhcp6_parser.cc"
     break;
 
-  case 432:
-#line 1486 "dhcp6_parser.yy"
+  case 434:
+#line 1488 "dhcp6_parser.yy"
     {
     ElementPtr space(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", space);
@@ -2465,8 +2465,8 @@ namespace isc { namespace dhcp {
 #line 2466 "dhcp6_parser.cc"
     break;
 
-  case 433:
-#line 1491 "dhcp6_parser.yy"
+  case 435:
+#line 1493 "dhcp6_parser.yy"
     {
     ElementPtr persist(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
@@ -2474,8 +2474,8 @@ namespace isc { namespace dhcp {
 #line 2475 "dhcp6_parser.cc"
     break;
 
-  case 434:
-#line 1499 "dhcp6_parser.yy"
+  case 436:
+#line 1501 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pools", l);
@@ -2485,8 +2485,8 @@ namespace isc { namespace dhcp {
 #line 2486 "dhcp6_parser.cc"
     break;
 
-  case 435:
-#line 1504 "dhcp6_parser.yy"
+  case 437:
+#line 1506 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2494,8 +2494,8 @@ namespace isc { namespace dhcp {
 #line 2495 "dhcp6_parser.cc"
     break;
 
-  case 440:
-#line 1519 "dhcp6_parser.yy"
+  case 442:
+#line 1521 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2504,8 +2504,8 @@ namespace isc { namespace dhcp {
 #line 2505 "dhcp6_parser.cc"
     break;
 
-  case 441:
-#line 1523 "dhcp6_parser.yy"
+  case 443:
+#line 1525 "dhcp6_parser.yy"
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2514,8 +2514,8 @@ namespace isc { namespace dhcp {
 #line 2515 "dhcp6_parser.cc"
     break;
 
-  case 442:
-#line 1529 "dhcp6_parser.yy"
+  case 444:
+#line 1531 "dhcp6_parser.yy"
     {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2524,8 +2524,8 @@ namespace isc { namespace dhcp {
 #line 2525 "dhcp6_parser.cc"
     break;
 
-  case 443:
-#line 1533 "dhcp6_parser.yy"
+  case 445:
+#line 1535 "dhcp6_parser.yy"
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2533,16 +2533,16 @@ namespace isc { namespace dhcp {
 #line 2534 "dhcp6_parser.cc"
     break;
 
-  case 453:
-#line 1551 "dhcp6_parser.yy"
+  case 455:
+#line 1553 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2542 "dhcp6_parser.cc"
     break;
 
-  case 454:
-#line 1553 "dhcp6_parser.yy"
+  case 456:
+#line 1555 "dhcp6_parser.yy"
     {
     ElementPtr pool(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
@@ -2551,16 +2551,16 @@ namespace isc { namespace dhcp {
 #line 2552 "dhcp6_parser.cc"
     break;
 
-  case 455:
-#line 1559 "dhcp6_parser.yy"
+  case 457:
+#line 1561 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2560 "dhcp6_parser.cc"
     break;
 
-  case 456:
-#line 1561 "dhcp6_parser.yy"
+  case 458:
+#line 1563 "dhcp6_parser.yy"
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context = yystack_[0].value.as < ElementPtr > ();
@@ -2586,16 +2586,16 @@ namespace isc { namespace dhcp {
 #line 2587 "dhcp6_parser.cc"
     break;
 
-  case 457:
-#line 1584 "dhcp6_parser.yy"
+  case 459:
+#line 1586 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2595 "dhcp6_parser.cc"
     break;
 
-  case 458:
-#line 1586 "dhcp6_parser.yy"
+  case 460:
+#line 1588 "dhcp6_parser.yy"
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location)));
@@ -2623,8 +2623,8 @@ namespace isc { namespace dhcp {
 #line 2624 "dhcp6_parser.cc"
     break;
 
-  case 459:
-#line 1614 "dhcp6_parser.yy"
+  case 461:
+#line 1616 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pd-pools", l);
@@ -2634,8 +2634,8 @@ namespace isc { namespace dhcp {
 #line 2635 "dhcp6_parser.cc"
     break;
 
-  case 460:
-#line 1619 "dhcp6_parser.yy"
+  case 462:
+#line 1621 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2643,8 +2643,8 @@ namespace isc { namespace dhcp {
 #line 2644 "dhcp6_parser.cc"
     break;
 
-  case 465:
-#line 1634 "dhcp6_parser.yy"
+  case 467:
+#line 1636 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2653,8 +2653,8 @@ namespace isc { namespace dhcp {
 #line 2654 "dhcp6_parser.cc"
     break;
 
-  case 466:
-#line 1638 "dhcp6_parser.yy"
+  case 468:
+#line 1640 "dhcp6_parser.yy"
     {
     // The prefix, prefix len and delegated len parameters are required.
     ctx.require("prefix", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2665,8 +2665,8 @@ namespace isc { namespace dhcp {
 #line 2666 "dhcp6_parser.cc"
     break;
 
-  case 467:
-#line 1646 "dhcp6_parser.yy"
+  case 469:
+#line 1648 "dhcp6_parser.yy"
     {
     // Parse the pd-pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2675,8 +2675,8 @@ namespace isc { namespace dhcp {
 #line 2676 "dhcp6_parser.cc"
     break;
 
-  case 468:
-#line 1650 "dhcp6_parser.yy"
+  case 470:
+#line 1652 "dhcp6_parser.yy"
     {
     // The prefix, prefix len and delegated len parameters are required.
     ctx.require("prefix", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2687,16 +2687,16 @@ namespace isc { namespace dhcp {
 #line 2688 "dhcp6_parser.cc"
     break;
 
-  case 482:
-#line 1675 "dhcp6_parser.yy"
+  case 484:
+#line 1677 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2696 "dhcp6_parser.cc"
     break;
 
-  case 483:
-#line 1677 "dhcp6_parser.yy"
+  case 485:
+#line 1679 "dhcp6_parser.yy"
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefix", prf);
@@ -2705,8 +2705,8 @@ namespace isc { namespace dhcp {
 #line 2706 "dhcp6_parser.cc"
     break;
 
-  case 484:
-#line 1683 "dhcp6_parser.yy"
+  case 486:
+#line 1685 "dhcp6_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefix-len", prf);
@@ -2714,16 +2714,16 @@ namespace isc { namespace dhcp {
 #line 2715 "dhcp6_parser.cc"
     break;
 
-  case 485:
-#line 1688 "dhcp6_parser.yy"
+  case 487:
+#line 1690 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2723 "dhcp6_parser.cc"
     break;
 
-  case 486:
-#line 1690 "dhcp6_parser.yy"
+  case 488:
+#line 1692 "dhcp6_parser.yy"
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("excluded-prefix", prf);
@@ -2732,8 +2732,8 @@ namespace isc { namespace dhcp {
 #line 2733 "dhcp6_parser.cc"
     break;
 
-  case 487:
-#line 1696 "dhcp6_parser.yy"
+  case 489:
+#line 1698 "dhcp6_parser.yy"
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("excluded-prefix-len", prf);
@@ -2741,8 +2741,8 @@ namespace isc { namespace dhcp {
 #line 2742 "dhcp6_parser.cc"
     break;
 
-  case 488:
-#line 1701 "dhcp6_parser.yy"
+  case 490:
+#line 1703 "dhcp6_parser.yy"
     {
     ElementPtr deleg(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("delegated-len", deleg);
@@ -2750,8 +2750,8 @@ namespace isc { namespace dhcp {
 #line 2751 "dhcp6_parser.cc"
     break;
 
-  case 489:
-#line 1709 "dhcp6_parser.yy"
+  case 491:
+#line 1711 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations", l);
@@ -2761,8 +2761,8 @@ namespace isc { namespace dhcp {
 #line 2762 "dhcp6_parser.cc"
     break;
 
-  case 490:
-#line 1714 "dhcp6_parser.yy"
+  case 492:
+#line 1716 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2770,8 +2770,8 @@ namespace isc { namespace dhcp {
 #line 2771 "dhcp6_parser.cc"
     break;
 
-  case 495:
-#line 1727 "dhcp6_parser.yy"
+  case 497:
+#line 1729 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2780,8 +2780,8 @@ namespace isc { namespace dhcp {
 #line 2781 "dhcp6_parser.cc"
     break;
 
-  case 496:
-#line 1731 "dhcp6_parser.yy"
+  case 498:
+#line 1733 "dhcp6_parser.yy"
     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
@@ -2789,8 +2789,8 @@ namespace isc { namespace dhcp {
 #line 2790 "dhcp6_parser.cc"
     break;
 
-  case 497:
-#line 1736 "dhcp6_parser.yy"
+  case 499:
+#line 1738 "dhcp6_parser.yy"
     {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2799,8 +2799,8 @@ namespace isc { namespace dhcp {
 #line 2800 "dhcp6_parser.cc"
     break;
 
-  case 498:
-#line 1740 "dhcp6_parser.yy"
+  case 500:
+#line 1742 "dhcp6_parser.yy"
     {
     /// @todo: an identifier parameter is required.
     // parsing completed
@@ -2808,8 +2808,8 @@ namespace isc { namespace dhcp {
 #line 2809 "dhcp6_parser.cc"
     break;
 
-  case 514:
-#line 1767 "dhcp6_parser.yy"
+  case 516:
+#line 1769 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-addresses", l);
@@ -2819,8 +2819,8 @@ namespace isc { namespace dhcp {
 #line 2820 "dhcp6_parser.cc"
     break;
 
-  case 515:
-#line 1772 "dhcp6_parser.yy"
+  case 517:
+#line 1774 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2828,8 +2828,8 @@ namespace isc { namespace dhcp {
 #line 2829 "dhcp6_parser.cc"
     break;
 
-  case 516:
-#line 1777 "dhcp6_parser.yy"
+  case 518:
+#line 1779 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefixes", l);
@@ -2839,8 +2839,8 @@ namespace isc { namespace dhcp {
 #line 2840 "dhcp6_parser.cc"
     break;
 
-  case 517:
-#line 1782 "dhcp6_parser.yy"
+  case 519:
+#line 1784 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2848,16 +2848,16 @@ namespace isc { namespace dhcp {
 #line 2849 "dhcp6_parser.cc"
     break;
 
-  case 518:
-#line 1787 "dhcp6_parser.yy"
+  case 520:
+#line 1789 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2857 "dhcp6_parser.cc"
     break;
 
-  case 519:
-#line 1789 "dhcp6_parser.yy"
+  case 521:
+#line 1791 "dhcp6_parser.yy"
     {
     ElementPtr d(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
@@ -2866,16 +2866,16 @@ namespace isc { namespace dhcp {
 #line 2867 "dhcp6_parser.cc"
     break;
 
-  case 520:
-#line 1795 "dhcp6_parser.yy"
+  case 522:
+#line 1797 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2875 "dhcp6_parser.cc"
     break;
 
-  case 521:
-#line 1797 "dhcp6_parser.yy"
+  case 523:
+#line 1799 "dhcp6_parser.yy"
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hw-address", hw);
@@ -2884,16 +2884,16 @@ namespace isc { namespace dhcp {
 #line 2885 "dhcp6_parser.cc"
     break;
 
-  case 522:
-#line 1803 "dhcp6_parser.yy"
+  case 524:
+#line 1805 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2893 "dhcp6_parser.cc"
     break;
 
-  case 523:
-#line 1805 "dhcp6_parser.yy"
+  case 525:
+#line 1807 "dhcp6_parser.yy"
     {
     ElementPtr host(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
@@ -2902,16 +2902,16 @@ namespace isc { namespace dhcp {
 #line 2903 "dhcp6_parser.cc"
     break;
 
-  case 524:
-#line 1811 "dhcp6_parser.yy"
+  case 526:
+#line 1813 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2911 "dhcp6_parser.cc"
     break;
 
-  case 525:
-#line 1813 "dhcp6_parser.yy"
+  case 527:
+#line 1815 "dhcp6_parser.yy"
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flex-id", hw);
@@ -2920,8 +2920,8 @@ namespace isc { namespace dhcp {
 #line 2921 "dhcp6_parser.cc"
     break;
 
-  case 526:
-#line 1819 "dhcp6_parser.yy"
+  case 528:
+#line 1821 "dhcp6_parser.yy"
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", c);
@@ -2931,8 +2931,8 @@ namespace isc { namespace dhcp {
 #line 2932 "dhcp6_parser.cc"
     break;
 
-  case 527:
-#line 1824 "dhcp6_parser.yy"
+  case 529:
+#line 1826 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2940,8 +2940,8 @@ namespace isc { namespace dhcp {
 #line 2941 "dhcp6_parser.cc"
     break;
 
-  case 528:
-#line 1832 "dhcp6_parser.yy"
+  case 530:
+#line 1834 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay", m);
@@ -2951,8 +2951,8 @@ namespace isc { namespace dhcp {
 #line 2952 "dhcp6_parser.cc"
     break;
 
-  case 529:
-#line 1837 "dhcp6_parser.yy"
+  case 531:
+#line 1839 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2960,16 +2960,16 @@ namespace isc { namespace dhcp {
 #line 2961 "dhcp6_parser.cc"
     break;
 
-  case 532:
-#line 1846 "dhcp6_parser.yy"
+  case 534:
+#line 1848 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2969 "dhcp6_parser.cc"
     break;
 
-  case 533:
-#line 1848 "dhcp6_parser.yy"
+  case 535:
+#line 1850 "dhcp6_parser.yy"
     {
     ElementPtr addr(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", addr);
@@ -2978,8 +2978,8 @@ namespace isc { namespace dhcp {
 #line 2979 "dhcp6_parser.cc"
     break;
 
-  case 534:
-#line 1857 "dhcp6_parser.yy"
+  case 536:
+#line 1859 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", l);
@@ -2989,8 +2989,8 @@ namespace isc { namespace dhcp {
 #line 2990 "dhcp6_parser.cc"
     break;
 
-  case 535:
-#line 1862 "dhcp6_parser.yy"
+  case 537:
+#line 1864 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2998,8 +2998,8 @@ namespace isc { namespace dhcp {
 #line 2999 "dhcp6_parser.cc"
     break;
 
-  case 538:
-#line 1871 "dhcp6_parser.yy"
+  case 540:
+#line 1873 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3008,8 +3008,8 @@ namespace isc { namespace dhcp {
 #line 3009 "dhcp6_parser.cc"
     break;
 
-  case 539:
-#line 1875 "dhcp6_parser.yy"
+  case 541:
+#line 1877 "dhcp6_parser.yy"
     {
     // The name client class parameter is required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -3018,16 +3018,16 @@ namespace isc { namespace dhcp {
 #line 3019 "dhcp6_parser.cc"
     break;
 
-  case 552:
-#line 1900 "dhcp6_parser.yy"
+  case 554:
+#line 1902 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3027 "dhcp6_parser.cc"
     break;
 
-  case 553:
-#line 1902 "dhcp6_parser.yy"
+  case 555:
+#line 1904 "dhcp6_parser.yy"
     {
     ElementPtr test(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
@@ -3036,8 +3036,8 @@ namespace isc { namespace dhcp {
 #line 3037 "dhcp6_parser.cc"
     break;
 
-  case 554:
-#line 1908 "dhcp6_parser.yy"
+  case 556:
+#line 1910 "dhcp6_parser.yy"
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("only-if-required", b);
@@ -3045,8 +3045,8 @@ namespace isc { namespace dhcp {
 #line 3046 "dhcp6_parser.cc"
     break;
 
-  case 555:
-#line 1916 "dhcp6_parser.yy"
+  case 557:
+#line 1918 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-id", m);
@@ -3056,8 +3056,8 @@ namespace isc { namespace dhcp {
 #line 3057 "dhcp6_parser.cc"
     break;
 
-  case 556:
-#line 1921 "dhcp6_parser.yy"
+  case 558:
+#line 1923 "dhcp6_parser.yy"
     {
     // The type parameter is required.
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -3067,16 +3067,16 @@ namespace isc { namespace dhcp {
 #line 3068 "dhcp6_parser.cc"
     break;
 
-  case 568:
-#line 1943 "dhcp6_parser.yy"
+  case 570:
+#line 1945 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.DUID_TYPE);
 }
 #line 3076 "dhcp6_parser.cc"
     break;
 
-  case 569:
-#line 1945 "dhcp6_parser.yy"
+  case 571:
+#line 1947 "dhcp6_parser.yy"
     {
     ctx.stack_.back()->set("type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3084,26 +3084,26 @@ namespace isc { namespace dhcp {
 #line 3085 "dhcp6_parser.cc"
     break;
 
-  case 570:
-#line 1950 "dhcp6_parser.yy"
+  case 572:
+#line 1952 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("LLT", ctx.loc2pos(yystack_[0].location))); }
 #line 3091 "dhcp6_parser.cc"
     break;
 
-  case 571:
-#line 1951 "dhcp6_parser.yy"
+  case 573:
+#line 1953 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("EN", ctx.loc2pos(yystack_[0].location))); }
 #line 3097 "dhcp6_parser.cc"
     break;
 
-  case 572:
-#line 1952 "dhcp6_parser.yy"
+  case 574:
+#line 1954 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("LL", ctx.loc2pos(yystack_[0].location))); }
 #line 3103 "dhcp6_parser.cc"
     break;
 
-  case 573:
-#line 1955 "dhcp6_parser.yy"
+  case 575:
+#line 1957 "dhcp6_parser.yy"
     {
     ElementPtr htype(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("htype", htype);
@@ -3111,16 +3111,16 @@ namespace isc { namespace dhcp {
 #line 3112 "dhcp6_parser.cc"
     break;
 
-  case 574:
-#line 1960 "dhcp6_parser.yy"
+  case 576:
+#line 1962 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3120 "dhcp6_parser.cc"
     break;
 
-  case 575:
-#line 1962 "dhcp6_parser.yy"
+  case 577:
+#line 1964 "dhcp6_parser.yy"
     {
     ElementPtr id(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("identifier", id);
@@ -3129,8 +3129,8 @@ namespace isc { namespace dhcp {
 #line 3130 "dhcp6_parser.cc"
     break;
 
-  case 576:
-#line 1968 "dhcp6_parser.yy"
+  case 578:
+#line 1970 "dhcp6_parser.yy"
     {
     ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("time", time);
@@ -3138,8 +3138,8 @@ namespace isc { namespace dhcp {
 #line 3139 "dhcp6_parser.cc"
     break;
 
-  case 577:
-#line 1973 "dhcp6_parser.yy"
+  case 579:
+#line 1975 "dhcp6_parser.yy"
     {
     ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enterprise-id", time);
@@ -3147,8 +3147,8 @@ namespace isc { namespace dhcp {
 #line 3148 "dhcp6_parser.cc"
     break;
 
-  case 578:
-#line 1980 "dhcp6_parser.yy"
+  case 580:
+#line 1982 "dhcp6_parser.yy"
     {
     ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
@@ -3156,8 +3156,8 @@ namespace isc { namespace dhcp {
 #line 3157 "dhcp6_parser.cc"
     break;
 
-  case 579:
-#line 1987 "dhcp6_parser.yy"
+  case 581:
+#line 1989 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("control-socket", m);
@@ -3167,8 +3167,8 @@ namespace isc { namespace dhcp {
 #line 3168 "dhcp6_parser.cc"
     break;
 
-  case 580:
-#line 1992 "dhcp6_parser.yy"
+  case 582:
+#line 1994 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3176,16 +3176,16 @@ namespace isc { namespace dhcp {
 #line 3177 "dhcp6_parser.cc"
     break;
 
-  case 588:
-#line 2008 "dhcp6_parser.yy"
+  case 590:
+#line 2010 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3185 "dhcp6_parser.cc"
     break;
 
-  case 589:
-#line 2010 "dhcp6_parser.yy"
+  case 591:
+#line 2012 "dhcp6_parser.yy"
     {
     ElementPtr stype(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-type", stype);
@@ -3194,16 +3194,16 @@ namespace isc { namespace dhcp {
 #line 3195 "dhcp6_parser.cc"
     break;
 
-  case 590:
-#line 2016 "dhcp6_parser.yy"
+  case 592:
+#line 2018 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3203 "dhcp6_parser.cc"
     break;
 
-  case 591:
-#line 2018 "dhcp6_parser.yy"
+  case 593:
+#line 2020 "dhcp6_parser.yy"
     {
     ElementPtr name(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-name", name);
@@ -3212,16 +3212,16 @@ namespace isc { namespace dhcp {
 #line 3213 "dhcp6_parser.cc"
     break;
 
-  case 592:
-#line 2026 "dhcp6_parser.yy"
+  case 594:
+#line 2028 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3221 "dhcp6_parser.cc"
     break;
 
-  case 593:
-#line 2028 "dhcp6_parser.yy"
+  case 595:
+#line 2030 "dhcp6_parser.yy"
     {
     ElementPtr qc = yystack_[0].value.as < ElementPtr > ();
     ctx.stack_.back()->set("dhcp-queue-control", qc);
@@ -3260,8 +3260,8 @@ namespace isc { namespace dhcp {
 #line 3261 "dhcp6_parser.cc"
     break;
 
-  case 594:
-#line 2066 "dhcp6_parser.yy"
+  case 596:
+#line 2068 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp-ddns", m);
@@ -3271,8 +3271,8 @@ namespace isc { namespace dhcp {
 #line 3272 "dhcp6_parser.cc"
     break;
 
-  case 595:
-#line 2071 "dhcp6_parser.yy"
+  case 597:
+#line 2073 "dhcp6_parser.yy"
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -3282,8 +3282,8 @@ namespace isc { namespace dhcp {
 #line 3283 "dhcp6_parser.cc"
     break;
 
-  case 596:
-#line 2078 "dhcp6_parser.yy"
+  case 598:
+#line 2080 "dhcp6_parser.yy"
     {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3292,8 +3292,8 @@ namespace isc { namespace dhcp {
 #line 3293 "dhcp6_parser.cc"
     break;
 
-  case 597:
-#line 2082 "dhcp6_parser.yy"
+  case 599:
+#line 2084 "dhcp6_parser.yy"
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -3302,8 +3302,8 @@ namespace isc { namespace dhcp {
 #line 3303 "dhcp6_parser.cc"
     break;
 
-  case 618:
-#line 2112 "dhcp6_parser.yy"
+  case 620:
+#line 2114 "dhcp6_parser.yy"
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
@@ -3311,16 +3311,16 @@ namespace isc { namespace dhcp {
 #line 3312 "dhcp6_parser.cc"
     break;
 
-  case 619:
-#line 2117 "dhcp6_parser.yy"
+  case 621:
+#line 2119 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3320 "dhcp6_parser.cc"
     break;
 
-  case 620:
-#line 2119 "dhcp6_parser.yy"
+  case 622:
+#line 2121 "dhcp6_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("qualifying-suffix", s);
@@ -3329,16 +3329,16 @@ namespace isc { namespace dhcp {
 #line 3330 "dhcp6_parser.cc"
     break;
 
-  case 621:
-#line 2125 "dhcp6_parser.yy"
+  case 623:
+#line 2127 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3338 "dhcp6_parser.cc"
     break;
 
-  case 622:
-#line 2127 "dhcp6_parser.yy"
+  case 624:
+#line 2129 "dhcp6_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-ip", s);
@@ -3347,8 +3347,8 @@ namespace isc { namespace dhcp {
 #line 3348 "dhcp6_parser.cc"
     break;
 
-  case 623:
-#line 2133 "dhcp6_parser.yy"
+  case 625:
+#line 2135 "dhcp6_parser.yy"
     {
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
@@ -3356,16 +3356,16 @@ namespace isc { namespace dhcp {
 #line 3357 "dhcp6_parser.cc"
     break;
 
-  case 624:
-#line 2138 "dhcp6_parser.yy"
+  case 626:
+#line 2140 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3365 "dhcp6_parser.cc"
     break;
 
-  case 625:
-#line 2140 "dhcp6_parser.yy"
+  case 627:
+#line 2142 "dhcp6_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-ip", s);
@@ -3374,8 +3374,8 @@ namespace isc { namespace dhcp {
 #line 3375 "dhcp6_parser.cc"
     break;
 
-  case 626:
-#line 2146 "dhcp6_parser.yy"
+  case 628:
+#line 2148 "dhcp6_parser.yy"
     {
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
@@ -3383,8 +3383,8 @@ namespace isc { namespace dhcp {
 #line 3384 "dhcp6_parser.cc"
     break;
 
-  case 627:
-#line 2151 "dhcp6_parser.yy"
+  case 629:
+#line 2153 "dhcp6_parser.yy"
     {
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
@@ -3392,16 +3392,16 @@ namespace isc { namespace dhcp {
 #line 3393 "dhcp6_parser.cc"
     break;
 
-  case 628:
-#line 2156 "dhcp6_parser.yy"
+  case 630:
+#line 2158 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
 #line 3401 "dhcp6_parser.cc"
     break;
 
-  case 629:
-#line 2158 "dhcp6_parser.yy"
+  case 631:
+#line 2160 "dhcp6_parser.yy"
     {
     ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3409,28 +3409,28 @@ namespace isc { namespace dhcp {
 #line 3410 "dhcp6_parser.cc"
     break;
 
-  case 630:
-#line 2164 "dhcp6_parser.yy"
+  case 632:
+#line 2166 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
 #line 3416 "dhcp6_parser.cc"
     break;
 
-  case 631:
-#line 2165 "dhcp6_parser.yy"
+  case 633:
+#line 2167 "dhcp6_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
 #line 3422 "dhcp6_parser.cc"
     break;
 
-  case 632:
-#line 2168 "dhcp6_parser.yy"
+  case 634:
+#line 2170 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
 #line 3430 "dhcp6_parser.cc"
     break;
 
-  case 633:
-#line 2170 "dhcp6_parser.yy"
+  case 635:
+#line 2172 "dhcp6_parser.yy"
     {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
@@ -3439,8 +3439,8 @@ namespace isc { namespace dhcp {
 #line 3440 "dhcp6_parser.cc"
     break;
 
-  case 634:
-#line 2176 "dhcp6_parser.yy"
+  case 636:
+#line 2178 "dhcp6_parser.yy"
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-no-update", b);
@@ -3448,8 +3448,8 @@ namespace isc { namespace dhcp {
 #line 3449 "dhcp6_parser.cc"
     break;
 
-  case 635:
-#line 2181 "dhcp6_parser.yy"
+  case 637:
+#line 2183 "dhcp6_parser.yy"
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-client-update", b);
@@ -3457,16 +3457,16 @@ namespace isc { namespace dhcp {
 #line 3458 "dhcp6_parser.cc"
     break;
 
-  case 636:
-#line 2186 "dhcp6_parser.yy"
+  case 638:
+#line 2188 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
 #line 3466 "dhcp6_parser.cc"
     break;
 
-  case 637:
-#line 2188 "dhcp6_parser.yy"
+  case 639:
+#line 2190 "dhcp6_parser.yy"
     {
     ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3474,40 +3474,40 @@ namespace isc { namespace dhcp {
 #line 3475 "dhcp6_parser.cc"
     break;
 
-  case 638:
-#line 2194 "dhcp6_parser.yy"
+  case 640:
+#line 2196 "dhcp6_parser.yy"
     {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3483 "dhcp6_parser.cc"
     break;
 
-  case 639:
-#line 2197 "dhcp6_parser.yy"
+  case 641:
+#line 2199 "dhcp6_parser.yy"
     {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3491 "dhcp6_parser.cc"
     break;
 
-  case 640:
-#line 2200 "dhcp6_parser.yy"
+  case 642:
+#line 2202 "dhcp6_parser.yy"
     {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3499 "dhcp6_parser.cc"
     break;
 
-  case 641:
-#line 2203 "dhcp6_parser.yy"
+  case 643:
+#line 2205 "dhcp6_parser.yy"
     {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3507 "dhcp6_parser.cc"
     break;
 
-  case 642:
-#line 2206 "dhcp6_parser.yy"
+  case 644:
+#line 2208 "dhcp6_parser.yy"
     {
       error(yystack_[0].location, "boolean values for the replace-client-name are "
                 "no longer supported");
@@ -3515,16 +3515,16 @@ namespace isc { namespace dhcp {
 #line 3516 "dhcp6_parser.cc"
     break;
 
-  case 643:
-#line 2212 "dhcp6_parser.yy"
+  case 645:
+#line 2214 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3524 "dhcp6_parser.cc"
     break;
 
-  case 644:
-#line 2214 "dhcp6_parser.yy"
+  case 646:
+#line 2216 "dhcp6_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("generated-prefix", s);
@@ -3533,16 +3533,16 @@ namespace isc { namespace dhcp {
 #line 3534 "dhcp6_parser.cc"
     break;
 
-  case 645:
-#line 2220 "dhcp6_parser.yy"
+  case 647:
+#line 2222 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3542 "dhcp6_parser.cc"
     break;
 
-  case 646:
-#line 2222 "dhcp6_parser.yy"
+  case 648:
+#line 2224 "dhcp6_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-set", s);
@@ -3551,16 +3551,16 @@ namespace isc { namespace dhcp {
 #line 3552 "dhcp6_parser.cc"
     break;
 
-  case 647:
-#line 2228 "dhcp6_parser.yy"
+  case 649:
+#line 2230 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3560 "dhcp6_parser.cc"
     break;
 
-  case 648:
-#line 2230 "dhcp6_parser.yy"
+  case 650:
+#line 2232 "dhcp6_parser.yy"
     {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-replacement", s);
@@ -3569,16 +3569,16 @@ namespace isc { namespace dhcp {
 #line 3570 "dhcp6_parser.cc"
     break;
 
-  case 649:
-#line 2238 "dhcp6_parser.yy"
+  case 651:
+#line 2240 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3578 "dhcp6_parser.cc"
     break;
 
-  case 650:
-#line 2240 "dhcp6_parser.yy"
+  case 652:
+#line 2242 "dhcp6_parser.yy"
     {
     ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3586,16 +3586,16 @@ namespace isc { namespace dhcp {
 #line 3587 "dhcp6_parser.cc"
     break;
 
-  case 651:
-#line 2245 "dhcp6_parser.yy"
+  case 653:
+#line 2247 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3595 "dhcp6_parser.cc"
     break;
 
-  case 652:
-#line 2247 "dhcp6_parser.yy"
+  case 654:
+#line 2249 "dhcp6_parser.yy"
     {
     ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3603,16 +3603,16 @@ namespace isc { namespace dhcp {
 #line 3604 "dhcp6_parser.cc"
     break;
 
-  case 653:
-#line 2252 "dhcp6_parser.yy"
+  case 655:
+#line 2254 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3612 "dhcp6_parser.cc"
     break;
 
-  case 654:
-#line 2254 "dhcp6_parser.yy"
+  case 656:
+#line 2256 "dhcp6_parser.yy"
     {
     ctx.stack_.back()->set("Control-agent", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -3620,8 +3620,8 @@ namespace isc { namespace dhcp {
 #line 3621 "dhcp6_parser.cc"
     break;
 
-  case 655:
-#line 2261 "dhcp6_parser.yy"
+  case 657:
+#line 2263 "dhcp6_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-control", i);
@@ -3631,8 +3631,8 @@ namespace isc { namespace dhcp {
 #line 3632 "dhcp6_parser.cc"
     break;
 
-  case 656:
-#line 2266 "dhcp6_parser.yy"
+  case 658:
+#line 2268 "dhcp6_parser.yy"
     {
     // No config control params are required
     ctx.stack_.pop_back();
@@ -3641,8 +3641,8 @@ namespace isc { namespace dhcp {
 #line 3642 "dhcp6_parser.cc"
     break;
 
-  case 657:
-#line 2272 "dhcp6_parser.yy"
+  case 659:
+#line 2274 "dhcp6_parser.yy"
     {
     // Parse the config-control map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3651,8 +3651,8 @@ namespace isc { namespace dhcp {
 #line 3652 "dhcp6_parser.cc"
     break;
 
-  case 658:
-#line 2276 "dhcp6_parser.yy"
+  case 660:
+#line 2278 "dhcp6_parser.yy"
     {
     // No config_control params are required
     // parsing completed
@@ -3660,8 +3660,8 @@ namespace isc { namespace dhcp {
 #line 3661 "dhcp6_parser.cc"
     break;
 
-  case 663:
-#line 2291 "dhcp6_parser.yy"
+  case 665:
+#line 2293 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-databases", l);
@@ -3671,8 +3671,8 @@ namespace isc { namespace dhcp {
 #line 3672 "dhcp6_parser.cc"
     break;
 
-  case 664:
-#line 2296 "dhcp6_parser.yy"
+  case 666:
+#line 2298 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3680,8 +3680,8 @@ namespace isc { namespace dhcp {
 #line 3681 "dhcp6_parser.cc"
     break;
 
-  case 665:
-#line 2301 "dhcp6_parser.yy"
+  case 667:
+#line 2303 "dhcp6_parser.yy"
     {
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-fetch-wait-time", value);
@@ -3689,8 +3689,8 @@ namespace isc { namespace dhcp {
 #line 3690 "dhcp6_parser.cc"
     break;
 
-  case 666:
-#line 2311 "dhcp6_parser.yy"
+  case 668:
+#line 2313 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("Logging", m);
@@ -3700,8 +3700,8 @@ namespace isc { namespace dhcp {
 #line 3701 "dhcp6_parser.cc"
     break;
 
-  case 667:
-#line 2316 "dhcp6_parser.yy"
+  case 669:
+#line 2318 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3709,8 +3709,8 @@ namespace isc { namespace dhcp {
 #line 3710 "dhcp6_parser.cc"
     break;
 
-  case 668:
-#line 2321 "dhcp6_parser.yy"
+  case 670:
+#line 2323 "dhcp6_parser.yy"
     {
     // Parse the Logging map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3719,16 +3719,16 @@ namespace isc { namespace dhcp {
 #line 3720 "dhcp6_parser.cc"
     break;
 
-  case 669:
-#line 2325 "dhcp6_parser.yy"
+  case 671:
+#line 2327 "dhcp6_parser.yy"
     {
     // parsing completed
 }
 #line 3728 "dhcp6_parser.cc"
     break;
 
-  case 673:
-#line 2341 "dhcp6_parser.yy"
+  case 675:
+#line 2343 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("loggers", l);
@@ -3738,8 +3738,8 @@ namespace isc { namespace dhcp {
 #line 3739 "dhcp6_parser.cc"
     break;
 
-  case 674:
-#line 2346 "dhcp6_parser.yy"
+  case 676:
+#line 2348 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3747,8 +3747,8 @@ namespace isc { namespace dhcp {
 #line 3748 "dhcp6_parser.cc"
     break;
 
-  case 677:
-#line 2358 "dhcp6_parser.yy"
+  case 679:
+#line 2360 "dhcp6_parser.yy"
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
@@ -3757,16 +3757,16 @@ namespace isc { namespace dhcp {
 #line 3758 "dhcp6_parser.cc"
     break;
 
-  case 678:
-#line 2362 "dhcp6_parser.yy"
+  case 680:
+#line 2364 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
 }
 #line 3766 "dhcp6_parser.cc"
     break;
 
-  case 688:
-#line 2379 "dhcp6_parser.yy"
+  case 690:
+#line 2381 "dhcp6_parser.yy"
     {
     ElementPtr dl(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
@@ -3774,16 +3774,16 @@ namespace isc { namespace dhcp {
 #line 3775 "dhcp6_parser.cc"
     break;
 
-  case 689:
-#line 2384 "dhcp6_parser.yy"
+  case 691:
+#line 2386 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3783 "dhcp6_parser.cc"
     break;
 
-  case 690:
-#line 2386 "dhcp6_parser.yy"
+  case 692:
+#line 2388 "dhcp6_parser.yy"
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
@@ -3792,8 +3792,8 @@ namespace isc { namespace dhcp {
 #line 3793 "dhcp6_parser.cc"
     break;
 
-  case 691:
-#line 2392 "dhcp6_parser.yy"
+  case 693:
+#line 2394 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
@@ -3803,8 +3803,8 @@ namespace isc { namespace dhcp {
 #line 3804 "dhcp6_parser.cc"
     break;
 
-  case 692:
-#line 2397 "dhcp6_parser.yy"
+  case 694:
+#line 2399 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3812,8 +3812,8 @@ namespace isc { namespace dhcp {
 #line 3813 "dhcp6_parser.cc"
     break;
 
-  case 695:
-#line 2406 "dhcp6_parser.yy"
+  case 697:
+#line 2408 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3822,24 +3822,24 @@ namespace isc { namespace dhcp {
 #line 3823 "dhcp6_parser.cc"
     break;
 
-  case 696:
-#line 2410 "dhcp6_parser.yy"
+  case 698:
+#line 2412 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
 }
 #line 3831 "dhcp6_parser.cc"
     break;
 
-  case 703:
-#line 2424 "dhcp6_parser.yy"
+  case 705:
+#line 2426 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3839 "dhcp6_parser.cc"
     break;
 
-  case 704:
-#line 2426 "dhcp6_parser.yy"
+  case 706:
+#line 2428 "dhcp6_parser.yy"
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
@@ -3848,8 +3848,8 @@ namespace isc { namespace dhcp {
 #line 3849 "dhcp6_parser.cc"
     break;
 
-  case 705:
-#line 2432 "dhcp6_parser.yy"
+  case 707:
+#line 2434 "dhcp6_parser.yy"
     {
     ElementPtr flush(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
@@ -3857,8 +3857,8 @@ namespace isc { namespace dhcp {
 #line 3858 "dhcp6_parser.cc"
     break;
 
-  case 706:
-#line 2437 "dhcp6_parser.yy"
+  case 708:
+#line 2439 "dhcp6_parser.yy"
     {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
@@ -3866,8 +3866,8 @@ namespace isc { namespace dhcp {
 #line 3867 "dhcp6_parser.cc"
     break;
 
-  case 707:
-#line 2442 "dhcp6_parser.yy"
+  case 709:
+#line 2444 "dhcp6_parser.yy"
     {
     ElementPtr maxver(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
@@ -4147,128 +4147,128 @@ namespace isc { namespace dhcp {
   }
 
 
-  const short Dhcp6Parser::yypact_ninf_ = -873;
+  const short Dhcp6Parser::yypact_ninf_ = -875;
 
   const signed char Dhcp6Parser::yytable_ninf_ = -1;
 
   const short
   Dhcp6Parser::yypact_[] =
   {
-     486,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,    38,    36,    33,    47,
-      49,    62,   114,   118,   149,   161,   162,   175,   195,   199,
-     203,   205,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,    36,  -133,    24,   181,    42,   448,    81,    72,
-      59,    31,    61,   261,   -57,   214,    40,   127,  -873,   235,
-     253,   299,   257,   281,  -873,  -873,  -873,  -873,  -873,   313,
-    -873,    41,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,   338,   339,   355,   357,   367,   368,
-     369,   371,   377,   383,   387,   395,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,   404,  -873,  -873,  -873,  -873,  -873,    84,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,   405,  -873,   172,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,   406,   409,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,   178,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,   182,  -873,  -873,  -873,  -873,  -873,
-     411,  -873,   414,   417,  -873,  -873,  -873,  -873,  -873,  -873,
-     251,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,   298,   382,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,   333,  -873,
-    -873,   418,  -873,  -873,  -873,   428,  -873,  -873,   393,   400,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,   432,   433,  -873,  -873,  -873,  -873,   435,
-     437,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,   273,  -873,  -873,  -873,   440,  -873,  -873,
-     444,  -873,   449,   450,  -873,  -873,   452,   454,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,   279,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,   290,  -873,  -873,  -873,   456,   292,  -873,  -873,
-    -873,  -873,    36,    36,  -873,   271,   457,   462,   465,   467,
-     469,  -873,    24,  -873,   470,   472,   473,   474,   480,   481,
-     259,   304,   305,   306,   307,   320,   321,   322,   328,   334,
-     340,   329,   501,   503,   504,   505,   506,   515,   516,   517,
-     518,   528,   529,   530,   531,   532,   533,   534,   535,   358,
-     537,   538,   540,   541,   181,  -873,   544,   365,    42,  -873,
-     546,   547,   548,   549,   552,   375,   374,   555,   556,   557,
-     448,  -873,   559,    81,  -873,   560,   384,   561,   385,   386,
-      72,  -873,   566,   567,   568,   569,   570,   571,   572,  -873,
-      59,  -873,   573,   574,   401,   575,   577,   578,   402,  -873,
-      61,   580,   407,   408,  -873,   261,   581,   585,   112,  -873,
-     410,   589,   591,   415,   594,   420,   421,   595,   596,   412,
-     423,   600,   605,   606,   607,   214,  -873,    40,  -873,   608,
-     431,   127,  -873,  -873,  -873,   610,   609,   611,    36,    36,
-      36,  -873,   434,   612,   613,   615,   617,   620,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-     436,   621,   622,   623,   624,   451,   341,   625,   628,   629,
-     662,   663,   668,   671,   672,   673,   674,  -873,   675,   624,
-     676,   679,  -873,   680,  -873,  -873,   681,   683,   497,   498,
-     508,  -873,  -873,   680,   510,   685,  -873,   512,  -873,   513,
-    -873,   514,  -873,  -873,  -873,   680,   680,   680,   519,   520,
-     521,   522,  -873,   523,   524,  -873,   525,   526,   527,  -873,
-    -873,   536,  -873,  -873,  -873,   539,    36,  -873,  -873,   542,
-     543,  -873,   545,  -873,  -873,   170,   550,  -873,  -873,    23,
-     551,   553,   554,  -873,  -873,   691,  -873,  -873,    36,   181,
-      40,  -873,  -873,  -873,  -873,   127,    42,    74,    74,   692,
-    -873,   702,   703,   704,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,   705,   -52,    36,    29,   626,   706,   707,   708,
-     135,   121,   132,  -873,   214,   709,  -873,  -873,   711,   714,
-    -873,  -873,  -873,  -873,  -873,   -65,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-     692,  -873,   293,   301,   302,   311,  -873,  -873,  -873,  -873,
-     718,   721,   723,   724,   725,  -873,   726,   727,  -873,  -873,
-    -873,   729,   732,   733,  -873,   323,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,   324,  -873,   734,   735,
-    -873,  -873,   736,   738,  -873,  -873,   737,   741,  -873,  -873,
-     739,   743,  -873,  -873,   742,   744,  -873,  -873,  -873,    93,
-    -873,  -873,  -873,   745,  -873,  -873,  -873,   188,  -873,  -873,
-    -873,  -873,   325,  -873,  -873,  -873,   260,  -873,  -873,   746,
-     747,  -873,  -873,   748,   750,  -873,   751,   752,   753,   754,
-     755,   756,   326,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,   757,   758,   759,  -873,  -873,  -873,  -873,   327,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,   336,  -873,  -873,  -873,   337,  -873,   280,  -873,   558,
-    -873,   760,   761,  -873,  -873,   762,   764,  -873,  -873,  -873,
-     763,  -873,   766,  -873,  -873,  -873,  -873,   765,   770,   771,
-     772,   583,   565,   588,   593,   597,   774,   598,   599,   778,
-     779,   780,   603,   604,   614,    74,  -873,  -873,    74,  -873,
-     692,   448,  -873,   702,    61,  -873,   703,   261,  -873,   704,
-     592,  -873,   705,   -52,  -873,  -873,    29,  -873,   783,   626,
-    -873,   107,   706,  -873,    59,  -873,   707,   -57,  -873,   708,
-     618,   619,   627,   630,   631,   632,   135,  -873,   784,   785,
-     633,   634,   636,   121,  -873,   786,   787,   132,  -873,  -873,
-      -4,   709,  -873,  -873,   788,   789,    81,  -873,   711,    72,
-    -873,   714,   791,  -873,  -873,   458,   616,   638,   641,  -873,
-    -873,  -873,  -873,  -873,   643,  -873,  -873,   644,   646,   651,
-    -873,  -873,  -873,  -873,   360,  -873,   362,  -873,   794,  -873,
-     795,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,   366,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,   653,  -873,  -873,   792,  -873,  -873,  -873,  -873,  -873,
-     796,   790,  -873,  -873,  -873,  -873,  -873,   797,  -873,   380,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,   -40,   655,
-    -873,  -873,  -873,  -873,   658,   664,  -873,  -873,   802,  -873,
-    -873,  -873,  -873,  -873,   381,  -873,  -873,  -873,  -873,  -873,
-    -873,   665,   390,  -873,   397,  -873,   666,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,   592,  -873,  -873,   803,   684,  -873,   107,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,   804,
-     667,   806,    -4,  -873,  -873,  -873,  -873,  -873,  -873,   669,
-    -873,  -873,   847,  -873,   686,  -873,  -873,   849,  -873,  -873,
-     291,  -873,   117,   849,  -873,  -873,   807,   853,   860,   399,
-    -873,  -873,  -873,  -873,  -873,  -873,   869,   694,   713,   716,
-     117,  -873,   710,  -873,  -873,  -873,  -873,  -873
+     428,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,    46,    70,    63,    65,
+      69,    71,    84,    93,    96,   100,   108,   130,   156,   184,
+     188,   190,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,    70,   -95,    29,    78,    41,   263,    80,   277,
+     444,   170,    43,   179,   -65,   506,    58,   291,  -875,   144,
+     273,   262,   275,   323,  -875,  -875,  -875,  -875,  -875,   332,
+    -875,    91,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,   334,   343,   353,   355,   359,   387,
+     391,   393,   394,   398,   399,   401,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,   403,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,    98,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,   405,  -875,   136,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,   408,
+     413,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,   137,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,   143,  -875,
+    -875,  -875,  -875,  -875,   415,  -875,   418,   420,  -875,  -875,
+    -875,  -875,  -875,  -875,   150,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,   320,   364,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,   419,  -875,  -875,   422,  -875,  -875,  -875,   426,
+    -875,  -875,   421,   439,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,   447,   458,  -875,
+    -875,  -875,  -875,   435,   463,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,   168,  -875,  -875,
+    -875,   466,  -875,  -875,   467,  -875,   469,   470,  -875,  -875,
+     471,   472,  -875,  -875,  -875,  -875,  -875,   182,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,   204,  -875,  -875,  -875,   473,   212,
+    -875,  -875,  -875,  -875,    70,    70,  -875,   286,   486,   487,
+     489,   492,   493,  -875,    29,  -875,   494,   495,   496,   497,
+     499,   500,   325,   326,   327,   328,   329,   335,   340,   341,
+     330,   342,   344,   346,   501,   502,   520,   522,   525,   526,
+     528,   529,   531,   532,   533,   535,   536,   537,   539,   546,
+     547,   372,   548,   549,   551,   552,   554,   555,    78,  -875,
+     556,   377,    41,  -875,   558,   559,   561,   562,   563,   386,
+     385,   566,   567,   568,   263,  -875,   569,    80,  -875,   573,
+     396,   575,   402,   404,   277,  -875,   576,   577,   583,   587,
+     608,   610,   612,  -875,   444,  -875,   614,   615,   438,   617,
+     618,   619,   440,  -875,    43,   622,   443,   445,  -875,   179,
+     624,   626,   246,  -875,   448,   627,   629,   454,   647,   474,
+     475,   648,   649,   476,   477,   650,   651,   506,  -875,    58,
+    -875,   658,   481,   291,  -875,  -875,  -875,   661,   659,   660,
+      70,    70,    70,  -875,   488,   663,   664,   665,   666,   669,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,   498,   670,   671,   672,   673,   504,   301,   676,
+     677,   678,   681,   682,   683,   685,   686,   687,   688,  -875,
+     689,   673,   690,   511,   512,   693,  -875,   694,  -875,  -875,
+     695,   696,   521,   523,   524,  -875,  -875,   694,   527,   699,
+    -875,   530,  -875,   534,  -875,   538,  -875,  -875,  -875,   694,
+     694,   694,   540,   541,   542,   543,  -875,   544,   545,  -875,
+     550,   553,   557,  -875,  -875,   560,  -875,  -875,  -875,   564,
+      70,  -875,  -875,   565,   570,  -875,   571,  -875,  -875,   248,
+     580,  -875,  -875,   -37,   572,  -875,  -875,   698,  -875,  -875,
+      70,    78,    58,  -875,  -875,  -875,  -875,   291,    41,   260,
+     260,   700,  -875,   702,   703,   705,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,   706,   -33,    70,    79,   585,   707,
+     709,   710,   157,   122,    97,  -875,   506,  -875,  -875,   711,
+    -875,  -875,   713,   721,  -875,  -875,  -875,  -875,  -875,   -48,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,   700,  -875,   220,   226,   254,   255,  -875,  -875,
+    -875,  -875,   725,   726,   728,   729,   731,  -875,   732,   733,
+    -875,  -875,  -875,   735,   736,   738,  -875,   257,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,   272,  -875,
+     662,   740,  -875,  -875,   741,   745,  -875,  -875,   743,   747,
+    -875,  -875,   748,   752,  -875,  -875,   750,   754,  -875,  -875,
+    -875,    37,  -875,  -875,  -875,   753,  -875,  -875,  -875,    82,
+    -875,  -875,  -875,  -875,   274,  -875,  -875,  -875,   200,  -875,
+    -875,   755,   757,  -875,  -875,   756,   760,  -875,   761,   762,
+     763,   764,   765,   766,   276,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,   767,   768,   769,  -875,  -875,  -875,
+    -875,   314,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,   315,  -875,  -875,  -875,   321,  -875,   211,
+    -875,   593,  -875,   758,   772,  -875,  -875,   770,   774,  -875,
+    -875,  -875,   771,  -875,   775,  -875,  -875,  -875,  -875,   776,
+     778,   779,   780,   596,   574,   603,   602,   605,   784,   607,
+     609,   786,   788,   789,   613,   616,   620,   260,  -875,  -875,
+     260,  -875,   700,   263,  -875,   702,    43,  -875,   703,   179,
+    -875,   705,   436,  -875,   706,   -33,  -875,  -875,    79,  -875,
+     790,   585,  -875,    83,   707,  -875,   444,  -875,   709,   -65,
+    -875,   710,   621,   623,   625,   628,   630,   631,   157,  -875,
+     792,   793,   632,   633,   634,   122,  -875,   795,   796,    97,
+    -875,  -875,     6,   711,  -875,  -875,   800,   798,    80,  -875,
+     713,   277,  -875,   721,   804,  -875,  -875,   425,   636,   637,
+     639,  -875,  -875,  -875,  -875,  -875,   640,  -875,  -875,   643,
+     645,   646,  -875,  -875,  -875,  -875,   322,  -875,   324,  -875,
+     794,  -875,   801,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,   362,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,   653,  -875,  -875,   807,  -875,  -875,  -875,
+    -875,  -875,   821,   833,  -875,  -875,  -875,  -875,  -875,   829,
+    -875,   363,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+     129,   657,  -875,  -875,  -875,  -875,   667,   691,  -875,  -875,
+     837,  -875,  -875,  -875,  -875,  -875,   370,  -875,  -875,  -875,
+    -875,  -875,  -875,   718,   371,  -875,   373,  -875,   720,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,   436,  -875,  -875,   846,   668,
+    -875,    83,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,   847,   701,   850,     6,  -875,  -875,  -875,  -875,  -875,
+    -875,   723,  -875,  -875,   739,  -875,   734,  -875,  -875,   852,
+    -875,  -875,   331,  -875,    75,   852,  -875,  -875,   865,   890,
+     898,   374,  -875,  -875,  -875,  -875,  -875,  -875,   903,   730,
+     742,   744,    75,  -875,   737,  -875,  -875,  -875,  -875,  -875
   };
 
   const unsigned short
@@ -4278,163 +4278,163 @@ 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,   135,     9,
-     282,    11,   442,    13,   467,    15,   497,    17,   367,    19,
-     375,    21,   412,    23,   247,    25,   596,    27,   668,    29,
-     657,    31,    49,    43,     0,     0,     0,     0,     0,     0,
-     499,     0,   377,   414,     0,     0,     0,     0,    51,     0,
-      50,     0,     0,    44,    70,   666,   649,   651,   653,     0,
-      69,     0,    62,    64,    66,    67,    68,    65,   117,   655,
-     133,   147,   149,   151,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   131,   274,   365,   404,
-     455,   457,   323,   331,   220,   237,   228,   213,   534,   489,
-     239,   258,   555,     0,   579,   592,   594,   673,   116,     0,
-      74,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-     112,   113,   114,    85,   110,    88,    89,    90,    91,   107,
-      92,    94,    93,    98,    99,    86,   111,    87,    96,    97,
-     105,   106,   108,    95,   100,   101,   102,   103,   104,   109,
-     115,   144,     0,   143,     0,   137,   139,   140,   141,   142,
-     434,   459,   313,   315,   317,     0,     0,   321,   319,   528,
-     312,   286,   287,   288,   289,   290,   291,   292,   293,   309,
-     310,   311,     0,   284,   297,   298,   299,   302,   303,   305,
-     300,   301,   294,   295,   307,   308,   296,   304,   306,   453,
-     452,   448,   449,   447,     0,   444,   446,   450,   451,   482,
-       0,   485,     0,     0,   481,   475,   476,   474,   479,   480,
-       0,   469,   471,   472,   477,   478,   473,   526,   514,   516,
-     518,   520,   522,   524,   513,   510,   511,   512,     0,   500,
-     501,   505,   506,   503,   507,   508,   509,   504,     0,   394,
-     194,     0,   398,   396,   401,     0,   390,   391,     0,   378,
-     379,   381,   393,   382,   383,   384,   400,   385,   386,   387,
-     388,   389,   428,     0,     0,   426,   427,   430,   431,     0,
-     415,   416,   418,   419,   420,   421,   422,   423,   424,   425,
-     254,   256,   251,     0,   249,   252,   253,     0,   619,   621,
-       0,   624,     0,     0,   628,   632,     0,     0,   636,   643,
-     645,   647,   617,   615,   616,     0,   598,   600,   601,   602,
+      39,     3,    37,    38,    60,     5,    72,     7,   137,     9,
+     284,    11,   444,    13,   469,    15,   499,    17,   369,    19,
+     377,    21,   414,    23,   249,    25,   598,    27,   670,    29,
+     659,    31,    49,    43,     0,     0,     0,     0,     0,     0,
+     501,     0,   379,   416,     0,     0,     0,     0,    51,     0,
+      50,     0,     0,    44,    70,   668,   651,   653,   655,     0,
+      69,     0,    62,    64,    66,    67,    68,    65,   119,   657,
+     135,   149,   151,   153,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   133,   276,   367,   406,
+     457,   459,   325,   333,   222,   239,   230,   215,   536,   491,
+     241,   260,   557,     0,   581,   594,   596,   647,   649,   675,
+     118,     0,    74,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,   112,   113,   114,    85,   110,    88,    89,    90,
+      91,   107,    92,    94,    93,    98,    99,    86,   111,    87,
+      96,    97,   105,   106,   108,    95,   100,   101,   102,   103,
+     104,   116,   117,   109,   115,   146,     0,   145,     0,   139,
+     141,   142,   143,   144,   436,   461,   315,   317,   319,     0,
+       0,   323,   321,   530,   314,   288,   289,   290,   291,   292,
+     293,   294,   295,   311,   312,   313,     0,   286,   299,   300,
+     301,   304,   305,   307,   302,   303,   296,   297,   309,   310,
+     298,   306,   308,   455,   454,   450,   451,   449,     0,   446,
+     448,   452,   453,   484,     0,   487,     0,     0,   483,   477,
+     478,   476,   481,   482,     0,   471,   473,   474,   479,   480,
+     475,   528,   516,   518,   520,   522,   524,   526,   515,   512,
+     513,   514,     0,   502,   503,   507,   508,   505,   509,   510,
+     511,   506,     0,   396,   196,     0,   400,   398,   403,     0,
+     392,   393,     0,   380,   381,   383,   395,   384,   385,   386,
+     402,   387,   388,   389,   390,   391,   430,     0,     0,   428,
+     429,   432,   433,     0,   417,   418,   420,   421,   422,   423,
+     424,   425,   426,   427,   256,   258,   253,     0,   251,   254,
+     255,     0,   621,   623,     0,   626,     0,     0,   630,   634,
+       0,     0,   638,   645,   619,   617,   618,     0,   600,   602,
      603,   604,   605,   606,   607,   608,   609,   610,   611,   612,
-     613,   614,     0,   670,   672,   663,     0,     0,   659,   661,
-     662,    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,
+     613,   614,   615,   616,     0,   672,   674,   665,     0,     0,
+     661,   663,   664,    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,    73,     0,     0,     0,   136,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   283,     0,     0,   443,     0,     0,     0,     0,     0,
-       0,   468,     0,     0,     0,     0,     0,     0,     0,   498,
-       0,   368,     0,     0,     0,     0,     0,     0,     0,   376,
-       0,     0,     0,     0,   413,     0,     0,     0,     0,   248,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   597,     0,   669,     0,
-       0,     0,   658,    52,    45,     0,     0,     0,     0,     0,
-       0,    63,     0,     0,     0,     0,     0,     0,   119,   120,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    73,
+       0,     0,     0,   138,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   285,     0,     0,   445,     0,
+       0,     0,     0,     0,     0,   470,     0,     0,     0,     0,
+       0,     0,     0,   500,     0,   370,     0,     0,     0,     0,
+       0,     0,     0,   378,     0,     0,     0,     0,   415,     0,
+       0,     0,     0,   250,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   599,     0,
+     671,     0,     0,     0,   660,    52,    45,     0,     0,     0,
+       0,     0,     0,    63,     0,     0,     0,     0,     0,     0,
      121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     131,   132,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   580,
+       0,     0,     0,     0,     0,     0,    75,     0,   148,   140,
+       0,     0,     0,     0,     0,   331,   332,     0,     0,     0,
+     287,     0,   447,     0,   486,     0,   489,   490,   472,     0,
+       0,     0,     0,     0,     0,     0,   504,     0,     0,   394,
+       0,     0,     0,   405,   382,     0,   434,   435,   419,     0,
+       0,   252,   620,     0,     0,   625,     0,   628,   629,     0,
+       0,   636,   637,     0,     0,   601,   673,     0,   667,   662,
+       0,     0,     0,   652,   654,   656,   120,     0,     0,     0,
+       0,   155,   134,   278,   371,   408,    42,   458,   460,   327,
+     328,   329,   330,   326,   335,     0,    49,     0,     0,     0,
+     493,   243,     0,     0,     0,   595,     0,   648,   650,     0,
+      53,   147,   438,   463,   316,   318,   320,   324,   322,     0,
+     456,   485,   488,   529,   517,   519,   521,   523,   525,   527,
+     397,   197,   401,   399,   404,   431,   257,   259,   622,   624,
+     627,   632,   633,   631,   635,   640,   641,   642,   643,   644,
+     639,   646,   155,    46,     0,     0,     0,     0,   183,   189,
+     191,   193,     0,     0,     0,     0,     0,   206,     0,     0,
+     209,   211,   213,     0,     0,     0,   182,     0,   161,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   175,
+     176,   177,   178,   173,   174,   179,   180,   181,     0,   159,
+       0,   156,   157,   282,     0,   279,   280,   375,     0,   372,
+     373,   412,     0,   409,   410,   339,     0,   336,   337,   228,
+     229,     0,   224,   226,   227,     0,   237,   238,   234,     0,
+     232,   235,   236,   220,     0,   217,   219,   540,     0,   538,
+     497,     0,   494,   495,   247,     0,   244,   245,     0,     0,
+       0,     0,     0,     0,     0,   262,   264,   265,   266,   267,
+     268,   269,   570,   576,     0,     0,     0,   569,   566,   567,
+     568,     0,   559,   561,   564,   562,   563,   565,   590,   592,
+     589,   587,   588,     0,   583,   585,   586,     0,   679,     0,
+     677,    55,   442,     0,   439,   440,   467,     0,   464,   465,
+     534,   533,     0,   532,     0,    71,   669,   658,   136,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   578,     0,     0,
-       0,     0,    75,     0,   146,   138,     0,     0,     0,     0,
-       0,   329,   330,     0,     0,     0,   285,     0,   445,     0,
-     484,     0,   487,   488,   470,     0,     0,     0,     0,     0,
-       0,     0,   502,     0,     0,   392,     0,     0,     0,   403,
-     380,     0,   432,   433,   417,     0,     0,   250,   618,     0,
-       0,   623,     0,   626,   627,     0,     0,   634,   635,     0,
-       0,     0,     0,   599,   671,     0,   665,   660,     0,     0,
-       0,   650,   652,   654,   118,     0,     0,     0,     0,   153,
-     132,   276,   369,   406,    42,   456,   458,   325,   326,   327,
-     328,   324,   333,     0,    49,     0,     0,     0,   491,   241,
-       0,     0,     0,   593,     0,     0,    53,   145,   436,   461,
-     314,   316,   318,   322,   320,     0,   454,   483,   486,   527,
-     515,   517,   519,   521,   523,   525,   395,   195,   399,   397,
-     402,   429,   255,   257,   620,   622,   625,   630,   631,   629,
-     633,   638,   639,   640,   641,   642,   637,   644,   646,   648,
-     153,    46,     0,     0,     0,     0,   181,   187,   189,   191,
-       0,     0,     0,     0,     0,   204,     0,     0,   207,   209,
-     211,     0,     0,     0,   180,     0,   159,   161,   162,   163,
-     164,   165,   166,   167,   168,   169,   170,   173,   174,   175,
-     176,   171,   172,   177,   178,   179,     0,   157,     0,   154,
-     155,   280,     0,   277,   278,   373,     0,   370,   371,   410,
-       0,   407,   408,   337,     0,   334,   335,   226,   227,     0,
-     222,   224,   225,     0,   235,   236,   232,     0,   230,   233,
-     234,   218,     0,   215,   217,   538,     0,   536,   495,     0,
-     492,   493,   245,     0,   242,   243,     0,     0,     0,     0,
-       0,     0,     0,   260,   262,   263,   264,   265,   266,   267,
-     568,   574,     0,     0,     0,   567,   564,   565,   566,     0,
-     557,   559,   562,   560,   561,   563,   588,   590,   587,   585,
-     586,     0,   581,   583,   584,     0,   677,     0,   675,    55,
-     440,     0,   437,   438,   465,     0,   462,   463,   532,   531,
-       0,   530,     0,    71,   667,   656,   134,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   148,   150,     0,   152,
-       0,     0,   275,     0,   377,   366,     0,   414,   405,     0,
-       0,   332,     0,     0,   221,   238,     0,   229,     0,     0,
-     214,   540,     0,   535,   499,   490,     0,     0,   240,     0,
-       0,     0,     0,     0,     0,     0,     0,   259,     0,     0,
-       0,     0,     0,     0,   556,     0,     0,     0,   580,   595,
-       0,     0,   674,    57,     0,    56,     0,   435,     0,     0,
-     460,     0,     0,   529,   664,     0,     0,     0,     0,   193,
-     196,   197,   198,   199,     0,   206,   200,     0,     0,     0,
-     201,   202,   203,   160,     0,   156,     0,   279,     0,   372,
-       0,   409,   364,   352,   353,   354,   356,   357,   358,   345,
-     346,   361,   362,   363,   341,   342,   343,   344,   350,   351,
-     349,   355,     0,   339,   347,   359,   360,   348,   336,   223,
-     231,     0,   216,   552,     0,   550,   551,   547,   548,   549,
-       0,   541,   542,   544,   545,   546,   537,     0,   494,     0,
-     244,   268,   269,   270,   271,   272,   273,   261,     0,     0,
-     573,   576,   577,   558,     0,     0,   582,   691,     0,   689,
-     687,   681,   685,   686,     0,   679,   683,   684,   682,   676,
-      54,     0,     0,   439,     0,   464,     0,   183,   184,   185,
-     186,   182,   188,   190,   192,   205,   208,   210,   212,   158,
-     281,   374,   411,     0,   338,   219,     0,     0,   539,     0,
-     496,   246,   570,   571,   572,   569,   575,   589,   591,     0,
-       0,     0,     0,   678,    58,   441,   466,   533,   340,     0,
-     554,   543,     0,   688,     0,   680,   553,     0,   690,   695,
-       0,   693,     0,     0,   692,   703,     0,     0,     0,     0,
-     697,   699,   700,   701,   702,   694,     0,     0,     0,     0,
-       0,   696,     0,   705,   706,   707,   698,   704
+       0,     0,     0,     0,     0,     0,     0,     0,   150,   152,
+       0,   154,     0,     0,   277,     0,   379,   368,     0,   416,
+     407,     0,     0,   334,     0,     0,   223,   240,     0,   231,
+       0,     0,   216,   542,     0,   537,   501,   492,     0,     0,
+     242,     0,     0,     0,     0,     0,     0,     0,     0,   261,
+       0,     0,     0,     0,     0,     0,   558,     0,     0,     0,
+     582,   597,     0,     0,   676,    57,     0,    56,     0,   437,
+       0,     0,   462,     0,     0,   531,   666,     0,     0,     0,
+       0,   195,   198,   199,   200,   201,     0,   208,   202,     0,
+       0,     0,   203,   204,   205,   162,     0,   158,     0,   281,
+       0,   374,     0,   411,   366,   354,   355,   356,   358,   359,
+     360,   347,   348,   363,   364,   365,   343,   344,   345,   346,
+     352,   353,   351,   357,     0,   341,   349,   361,   362,   350,
+     338,   225,   233,     0,   218,   554,     0,   552,   553,   549,
+     550,   551,     0,   543,   544,   546,   547,   548,   539,     0,
+     496,     0,   246,   270,   271,   272,   273,   274,   275,   263,
+       0,     0,   575,   578,   579,   560,     0,     0,   584,   693,
+       0,   691,   689,   683,   687,   688,     0,   681,   685,   686,
+     684,   678,    54,     0,     0,   441,     0,   466,     0,   185,
+     186,   187,   188,   184,   190,   192,   194,   207,   210,   212,
+     214,   160,   283,   376,   413,     0,   340,   221,     0,     0,
+     541,     0,   498,   248,   572,   573,   574,   571,   577,   591,
+     593,     0,     0,     0,     0,   680,    58,   443,   468,   535,
+     342,     0,   556,   545,     0,   690,     0,   682,   555,     0,
+     692,   697,     0,   695,     0,     0,   694,   705,     0,     0,
+       0,     0,   699,   701,   702,   703,   704,   696,     0,     0,
+       0,     0,     0,   698,     0,   707,   708,   709,   700,   706
   };
 
   const short
   Dhcp6Parser::yypgoto_[] =
   {
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,    -5,  -873,  -493,
-    -873,   240,  -873,  -873,  -873,  -873,   232,  -873,  -502,  -873,
-    -873,  -873,   -74,  -873,  -873,  -873,   495,  -873,  -873,  -873,
-    -873,   277,   455,  -873,  -873,   -70,   -58,   -38,   -31,   -30,
-     -20,   -17,     1,     9,    12,    13,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,   266,   478,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,   197,  -873,    20,  -873,  -620,    32,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-     -46,  -873,  -648,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,    11,  -873,  -873,  -873,  -873,  -873,    18,  -639,
-    -873,  -873,  -873,  -873,    17,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,     5,  -873,  -873,  -873,    10,   438,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,     2,  -873,  -873,  -873,
-    -873,  -873,  -873,  -872,  -873,  -873,  -873,    37,  -873,  -873,
-    -873,    44,   479,  -873,  -873,  -870,  -873,  -869,  -873,    15,
-    -873,    19,  -873,    14,  -873,  -873,  -873,  -868,  -873,  -873,
-    -873,  -873,    30,  -873,  -873,  -150,   855,  -873,  -873,  -873,
-    -873,  -873,    43,  -873,  -873,  -873,    46,  -873,   461,  -873,
-     -69,  -873,  -873,  -873,  -873,  -873,   -68,  -873,  -873,  -873,
-    -873,  -873,    -3,  -873,  -873,  -873,    39,  -873,  -873,  -873,
-      45,  -873,   459,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,   -11,  -873,  -873,  -873,    -1,   494,
-    -873,  -873,   -56,  -873,   -15,  -873,  -873,  -873,  -873,  -873,
-      -2,  -873,  -873,  -873,     3,   488,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,   -60,  -873,  -873,  -873,    34,  -873,  -873,
-    -873,    48,  -873,   483,   276,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -867,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,    51,  -873,  -873,  -873,
-    -135,  -873,  -873,  -873,  -873,  -873,  -873,  -873,    22,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,    21,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,   295,   464,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-    -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,  -873,
-     331,   445,  -873,  -873,  -873,  -873,  -873,  -873,  -873,   330,
-     460,   -61,  -873,  -873,    16,  -873,  -873,  -132,  -873,  -873,
-    -873,  -873,  -873,  -873,  -152,  -873,  -873,  -168,  -873,  -873,
-    -873,  -873,  -873
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,    54,  -875,  -480,
+    -875,   366,  -875,  -875,  -875,  -875,   267,  -875,  -389,  -875,
+    -875,  -875,   -74,  -875,  -875,  -875,   578,  -875,  -875,  -875,
+    -875,   285,   490,  -875,  -875,   -70,   -46,   -40,   -36,   -22,
+     -17,   -14,     3,     7,    10,    15,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,   287,   491,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,   217,  -875,    38,  -875,  -622,    44,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+     -21,  -875,  -650,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,    21,  -875,  -875,  -875,  -875,  -875,    30,  -641,
+    -875,  -875,  -875,  -875,    26,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,    17,  -875,  -875,  -875,    20,   449,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,     8,  -875,  -875,  -875,
+    -875,  -875,  -875,  -874,  -875,  -875,  -875,    47,  -875,  -875,
+    -875,    51,   503,  -875,  -875,  -869,  -875,  -867,  -875,   -11,
+    -875,    -5,  -875,    18,  -875,  -875,  -875,  -866,  -875,  -875,
+    -875,  -875,    45,  -875,  -875,  -140,   866,  -875,  -875,  -875,
+    -875,  -875,    50,  -875,  -875,  -875,    55,  -875,   468,  -875,
+     -69,  -875,  -875,  -875,  -875,  -875,   -66,  -875,  -875,  -875,
+    -875,  -875,   -58,  -875,  -875,  -875,    49,  -875,  -875,  -875,
+      56,  -875,   464,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,     4,  -875,  -875,  -875,    11,   505,
+    -875,  -875,   -53,  -875,   -29,  -875,  -875,  -875,  -875,  -875,
+       5,  -875,  -875,  -875,     9,   507,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,   -62,  -875,  -875,  -875,    48,  -875,  -875,
+    -875,    40,  -875,   508,   282,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -864,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,    53,  -875,  -875,  -875,
+    -128,  -875,  -875,  -875,  -875,  -875,  -875,  -875,    33,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,    25,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,   299,   462,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,   -73,  -875,   -51,  -875,
+    -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,  -875,
+     333,   460,  -875,  -875,  -875,  -875,  -875,  -875,  -875,   345,
+     465,   -44,  -875,  -875,    32,  -875,  -875,  -126,  -875,  -875,
+    -875,  -875,  -875,  -875,  -149,  -875,  -875,  -163,  -875,  -875,
+    -875,  -875,  -875
   };
 
   const short
@@ -4442,277 +4442,277 @@ 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,   645,    92,    93,    43,    72,    89,    90,   667,   849,
-     944,   945,   734,    45,    74,   101,   102,   103,   386,    47,
-      75,   149,   150,   151,   394,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   412,   165,
-     396,    49,    76,   194,   195,   196,   436,   197,   166,   397,
-     167,   398,   168,   399,   758,   759,   760,   888,   735,   736,
-     737,   867,  1071,   738,   868,   739,   869,   740,   870,   741,
-     742,   473,   743,   744,   745,   746,   747,   748,   749,   750,
-     751,   876,   752,   753,   879,   754,   880,   755,   881,   169,
-     423,   792,   793,   794,   908,   170,   420,   779,   780,   781,
-     782,   171,   422,   787,   788,   789,   790,   172,   421,   173,
-     426,   803,   804,   805,   917,    65,    84,   333,   334,   335,
-     486,   336,   487,   174,   427,   812,   813,   814,   815,   816,
-     817,   818,   819,   175,   413,   762,   763,   764,   891,    51,
-      77,   222,   223,   224,   442,   225,   443,   226,   444,   227,
-     448,   228,   447,   176,   418,   651,   230,   231,   177,   419,
-     774,   775,   776,   900,  1002,  1003,   178,   414,    59,    81,
-     766,   767,   768,   894,    61,    82,   298,   299,   300,   301,
-     302,   303,   304,   472,   305,   476,   306,   475,   307,   308,
-     477,   309,   179,   415,   770,   771,   772,   897,    63,    83,
-     319,   320,   321,   322,   323,   481,   324,   325,   326,   327,
-     233,   440,   851,   852,   853,   946,    53,    78,   244,   245,
-     246,   452,   180,   416,   181,   417,   236,   441,   855,   856,
-     857,   949,    55,    79,   260,   261,   262,   455,   263,   264,
-     457,   265,   266,   182,   425,   799,   800,   801,   914,    57,
-      80,   278,   279,   280,   281,   463,   282,   464,   283,   465,
-     284,   466,   285,   467,   286,   468,   287,   462,   238,   449,
-     860,   861,   952,   183,   424,   796,   797,   911,  1020,  1021,
-    1022,  1023,  1024,  1086,  1025,   184,   428,   829,   830,   831,
-     928,  1095,   832,   833,   929,   834,   835,   185,   186,   430,
-     841,   842,   843,   935,   844,   936,   187,   431,   188,   432,
-      67,    85,   355,   356,   357,   358,   491,   359,   492,   360,
-     361,   494,   362,   363,   364,   497,   699,   365,   498,   366,
-     367,   368,   501,   706,   369,   502,   370,   503,   371,   504,
-     104,   388,   105,   389,   106,   390,   189,   395,    71,    87,
-     377,   378,   379,   509,   380,   107,   387,    69,    86,   372,
-     373,   190,   433,   847,   848,   940,  1054,  1055,  1056,  1057,
-    1101,  1058,  1099,  1120,  1121,  1122,  1129,  1130,  1131,  1136,
-    1132,  1133,  1134
+      73,   647,    92,    93,    43,    72,    89,    90,   671,   851,
+     946,   947,   736,    45,    74,   101,   102,   103,   388,    47,
+      75,   151,   152,   153,   396,   154,   155,   156,   157,   158,
+     159,   160,   161,   162,   163,   164,   165,   166,   414,   167,
+     398,    49,    76,   198,   199,   200,   440,   201,   168,   399,
+     169,   400,   170,   401,   760,   761,   762,   890,   737,   738,
+     739,   869,  1073,   740,   870,   741,   871,   742,   872,   743,
+     744,   477,   745,   746,   747,   748,   749,   750,   751,   752,
+     753,   878,   754,   755,   881,   756,   882,   757,   883,   171,
+     425,   794,   795,   796,   910,   172,   422,   781,   782,   783,
+     784,   173,   424,   789,   790,   791,   792,   174,   423,   175,
+     428,   805,   806,   807,   919,    65,    84,   337,   338,   339,
+     490,   340,   491,   176,   429,   814,   815,   816,   817,   818,
+     819,   820,   821,   177,   415,   764,   765,   766,   893,    51,
+      77,   226,   227,   228,   446,   229,   447,   230,   448,   231,
+     452,   232,   451,   178,   420,   653,   234,   235,   179,   421,
+     776,   777,   778,   902,  1004,  1005,   180,   416,    59,    81,
+     768,   769,   770,   896,    61,    82,   302,   303,   304,   305,
+     306,   307,   308,   476,   309,   480,   310,   479,   311,   312,
+     481,   313,   181,   417,   772,   773,   774,   899,    63,    83,
+     323,   324,   325,   326,   327,   485,   328,   329,   330,   331,
+     237,   444,   853,   854,   855,   948,    53,    78,   248,   249,
+     250,   456,   182,   418,   183,   419,   240,   445,   857,   858,
+     859,   951,    55,    79,   264,   265,   266,   459,   267,   268,
+     461,   269,   270,   184,   427,   801,   802,   803,   916,    57,
+      80,   282,   283,   284,   285,   467,   286,   468,   287,   469,
+     288,   470,   289,   471,   290,   472,   291,   466,   242,   453,
+     862,   863,   954,   185,   426,   798,   799,   913,  1022,  1023,
+    1024,  1025,  1026,  1088,  1027,   186,   430,   831,   832,   833,
+     930,  1097,   834,   835,   931,   836,   837,   187,   188,   432,
+     843,   844,   845,   937,   846,   938,   189,   433,   190,   434,
+      67,    85,   357,   358,   359,   360,   495,   361,   496,   362,
+     363,   498,   364,   365,   366,   501,   703,   367,   502,   368,
+     369,   370,   505,   710,   371,   506,   191,   435,   192,   436,
+     104,   390,   105,   391,   106,   392,   193,   397,    71,    87,
+     379,   380,   381,   511,   382,   107,   389,    69,    86,   374,
+     375,   194,   437,   849,   850,   942,  1056,  1057,  1058,  1059,
+    1103,  1060,  1101,  1122,  1123,  1124,  1131,  1132,  1133,  1138,
+    1134,  1135,  1136
   };
 
   const unsigned short
   Dhcp6Parser::yytable_[] =
   {
-     100,   148,   193,   210,   240,   254,   274,   211,   296,   315,
-     332,   352,    40,   826,   317,   318,   786,   237,   756,   212,
-     198,   234,   247,   258,   276,   374,   310,   328,   995,   353,
-     996,   997,  1001,  1007,    94,   268,   297,   316,    32,   213,
-      44,    33,   858,    34,   392,    35,   214,   215,    91,   393,
-     777,   644,   330,   331,    46,   290,    48,   216,   191,   192,
-     217,   199,   235,   248,   259,   277,   644,   311,   329,    50,
-     354,   673,   130,   131,   232,   243,   257,   275,   218,  1092,
-    1093,  1094,   289,   679,   680,   681,   219,   434,   128,   220,
-     221,   229,   435,   241,   255,   716,   903,   242,   256,   904,
-     717,   718,   719,   720,   721,   722,   723,   724,   725,   726,
-     727,   728,   729,   730,   731,   732,   733,   129,   130,   131,
-     290,    52,   291,   292,    99,    54,   293,   294,   295,   778,
-     129,   777,   784,   290,   785,   130,   131,   130,   131,   129,
-     375,   376,   820,   249,   250,   251,   252,   253,   130,   131,
-     239,   721,  1047,   267,  1048,  1049,    56,   130,   131,   268,
-     269,   270,   271,   272,   273,   129,   290,   207,    58,    60,
-     208,   701,   702,   703,   704,   438,   207,    99,    95,   208,
-     439,   450,    62,   130,   131,   453,   451,    96,    97,    98,
-     454,   906,   108,   109,   907,   147,   110,   130,   131,   111,
-     112,   113,    64,  1013,  1014,    99,    66,   705,   130,   131,
-      68,   995,    70,   996,   997,  1001,  1007,    36,    37,    38,
-      39,   330,   331,    99,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-      99,   381,    99,   821,   822,   823,   824,   806,   807,   808,
-     809,   810,   811,    99,   460,    99,   382,   130,   131,   461,
-     836,   837,    99,   912,   132,   384,   913,   786,   974,   133,
-     134,   135,   136,   137,  1125,   138,   488,  1126,  1127,  1128,
-     139,   489,   505,   941,   385,   826,   942,   506,    99,   140,
-     130,   131,   141,   507,  1123,   511,   434,  1124,   508,   142,
-     512,   863,    99,   383,   507,   511,   469,   143,   144,   864,
-     865,   145,   146,    99,   438,   697,   698,   391,   100,   866,
-     290,   312,   291,   292,   313,   314,   885,   885,   909,   926,
-     933,   886,   887,   910,   927,   934,   147,   130,   131,   937,
-     505,   471,   400,   401,   938,   939,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,   346,   347,   348,   349,   402,
-     148,   403,    99,   885,   193,   450,   350,   351,  1079,  1083,
-    1080,   404,   405,   406,  1084,   407,   210,   513,   514,   240,
-     211,   408,   198,   488,  1102,   470,   254,   409,  1091,  1103,
-     237,   410,   212,   453,   234,    99,   274,   247,  1105,   411,
-     460,   479,  1140,   480,   258,  1106,   296,  1141,   429,   437,
-     445,   315,   213,   446,   276,   456,   317,   318,   458,   214,
-     215,   459,   474,   199,   310,   647,   648,   649,   650,   328,
-     216,   352,   478,   217,   297,   235,   482,   483,   248,   316,
-     485,   528,    99,   484,   490,   259,   374,   232,   493,   353,
-     243,   218,   515,   495,   496,   277,   499,   257,   500,   219,
-     510,   516,   220,   221,   229,   311,   517,   275,   241,   518,
-     329,   519,   242,   520,   522,   255,   523,   524,   525,   256,
-    1067,  1068,  1069,  1070,   526,   527,   529,   530,   531,   532,
-     354,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   533,   534,   535,   540,   129,   541,   542,   543,
-     544,   539,   536,   631,   632,   633,   200,   537,   201,   545,
-     546,   547,   548,   538,   130,   131,   202,   203,   204,   205,
-     206,   132,   549,   550,   551,   552,   553,   554,   555,   556,
-     557,   558,   559,   207,   560,   561,   208,   139,   563,   564,
-     566,   567,   568,   569,   209,   148,   570,   571,   572,   573,
-     574,   575,   193,   577,   579,   581,   580,   582,   583,   374,
-     585,   586,   587,   588,   589,   590,   591,   593,   594,   596,
-     198,   597,   598,   595,   601,   605,   599,   825,   838,   606,
-     352,   602,   603,   609,   608,   610,   617,   611,   612,   615,
-     616,   693,   613,   614,   619,   827,   839,   618,   353,   620,
-     621,   622,   625,   626,   628,   634,   629,   640,   630,   635,
-     636,   199,   637,   711,   638,   639,   641,   642,   643,    99,
-     652,    34,   646,   653,   654,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   828,   840,   127,   354,
-     129,   290,     1,     2,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,   655,   130,   131,
-     656,   203,   204,   657,   206,   132,   658,   659,   670,   671,
-     660,   661,   662,   664,   665,   666,   668,   207,   669,   672,
-     208,   674,   675,   676,   677,   678,   710,   700,   209,   757,
-     682,   683,   684,   685,   686,   687,   688,   689,   690,   761,
-     765,   769,   773,   795,   798,   802,   846,   691,   850,   791,
-     692,   854,   871,   694,   695,   872,   696,   873,   874,   875,
-     877,   878,   707,   882,   708,   709,   883,   884,   890,   943,
-     889,   893,   892,   895,   896,   898,   899,   902,   901,   960,
-     916,   905,   915,   919,   918,   920,   921,   922,   923,   924,
-     925,   930,   931,   932,   948,   959,   947,   951,   950,   955,
-     961,   953,   954,    99,   956,   957,   958,   962,   964,   963,
-     965,   966,   967,   968,   969,   970,   971,  1011,  1038,  1039,
-    1044,  1045,  1061,  1089,  1060,  1066,  1087,  1072,   972,   663,
-    1031,  1032,  1081,  1082,  1088,  1090,  1100,  1109,  1112,  1033,
-    1114,  1137,  1034,  1035,  1036,  1040,  1041,   210,  1042,  1073,
-     296,   211,  1074,   315,  1075,  1076,   982,  1077,   317,   318,
-     983,   237,  1078,   212,  1085,   234,  1096,  1015,   310,  1097,
-     274,   328,   984,   332,  1005,  1098,  1104,  1107,   297,  1113,
-    1116,   316,  1117,   213,   994,  1018,  1119,  1138,   276,   825,
-     214,   215,   985,   838,  1139,  1016,  1050,  1118,  1110,   986,
-     987,   216,   240,  1142,   217,   254,   235,   827,  1143,   311,
-     988,   839,   329,   989,  1052,  1006,   783,   521,   232,   562,
-     247,  1147,   218,   258,  1051,  1144,  1019,  1004,  1145,   277,
-     219,   990,   715,   220,   221,   229,   712,   862,  1017,   991,
-     975,   275,   992,   993,  1000,   998,   565,   973,   828,   999,
-    1012,  1009,   840,  1010,  1030,  1053,   607,  1029,  1037,   576,
-     977,   248,  1008,  1108,   259,   976,   288,  1063,   981,   979,
-     978,   600,   980,   243,   604,  1062,   257,   578,   584,  1065,
-    1028,   859,  1064,   592,  1111,  1043,   627,  1059,  1046,   845,
-     713,   241,  1027,  1026,   255,   242,   714,   624,   256,   623,
-    1115,  1135,  1146,     0,     0,     0,     0,     0,     0,     0,
+     100,   150,   197,   214,   244,   258,   278,   215,   300,   319,
+     336,   354,   372,   828,   321,   241,   788,   322,   758,   236,
+     247,   261,   279,   202,   238,   251,   262,   280,   997,   314,
+     332,   216,   355,   998,   373,   999,  1003,   217,  1009,    94,
+     905,   218,   376,   906,   334,   335,    32,   203,   239,   252,
+     263,   281,   272,   315,   333,   219,   356,   195,   196,   860,
+     220,   301,   320,   221,   293,   294,   646,   245,   259,   779,
+      44,    40,    46,   246,   260,    33,    48,    34,    50,    35,
+     222,   646,   130,   131,   223,   908,    91,   224,   909,   108,
+     109,    52,   225,   110,   394,   233,   111,   112,   113,   395,
+      54,   438,   294,    56,   295,   296,   439,    58,   297,   298,
+     299,   705,   706,   707,   708,    60,    99,   130,   131,   130,
+     131,   114,   115,   116,   117,   118,   119,   120,   121,   122,
+     123,   124,   125,   126,   127,   128,   129,    62,   129,   442,
+     454,   129,   294,   822,   443,   455,   457,   709,   780,   243,
+     383,   458,   723,   464,   130,   131,   130,   131,   465,   130,
+     131,   132,  1049,    64,  1050,  1051,   133,   134,   135,   136,
+     137,   492,   138,   130,   131,   211,   493,   139,   212,  1015,
+    1016,   779,   786,    95,   787,   507,   140,    99,   677,   141,
+     508,    66,    96,    97,    98,    68,   142,    70,   130,   131,
+     683,   684,   685,   914,   143,   144,   915,   509,   145,   146,
+      99,   997,   510,   149,   943,   513,   998,   944,   999,  1003,
+     514,  1009,    99,   438,    99,   838,   839,   128,   865,   509,
+     147,   148,  1127,   149,   866,  1128,  1129,  1130,   294,   316,
+     295,   296,   317,   318,   823,   824,   825,   826,  1094,  1095,
+    1096,    36,    37,    38,    39,   130,   131,   513,   442,    99,
+     887,    99,   867,   868,    99,   888,   385,   788,   976,   808,
+     809,   810,   811,   812,   813,   887,   384,   911,    99,   928,
+     889,   718,   912,   386,   929,   828,   719,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,    99,   377,   378,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   935,   939,   294,
+     100,   129,   936,   940,   507,   887,   387,   454,   473,   941,
+    1081,   204,  1082,   205,  1125,   129,   393,  1126,   402,   130,
+     131,   206,   207,   208,   209,   210,   132,   403,   253,   254,
+     255,   256,   257,   130,   131,   334,   335,   404,   211,   405,
+      99,   212,   139,   406,   150,  1085,   492,   474,   197,   213,
+    1086,  1093,   211,  1104,   457,   212,   464,  1142,  1105,  1107,
+     214,  1108,  1143,   244,   215,   649,   650,   651,   652,   202,
+     258,   407,   241,   701,   702,   408,   236,   409,   410,   247,
+     278,   238,   411,   412,   251,   413,   261,   431,   216,   441,
+     300,   262,   449,   203,   217,   319,   279,   450,   218,   460,
+     321,   280,   462,   322,   463,   239,   478,   475,   252,   483,
+     482,   314,   219,   354,   372,   263,   332,   220,   515,   516,
+     221,    99,   484,   488,    99,   281,   245,  1069,  1070,  1071,
+    1072,   486,   246,   259,   355,   315,   373,   222,    99,   260,
+     333,   223,   487,   301,   224,   376,   489,   517,   320,   225,
+     494,   497,   233,   499,   500,   503,   504,   512,   356,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     518,   519,   127,   520,   129,   294,   521,   522,   524,   525,
+     526,   527,   129,   528,   529,   542,   543,   530,   531,   532,
+     533,   534,   130,   131,   538,   207,   208,   535,   210,   132,
+     130,   131,   536,   537,   544,   539,   545,   540,   541,   546,
+     547,   211,   548,   549,   212,   550,   551,   552,   271,   553,
+     554,   555,   213,   556,   272,   273,   274,   275,   276,   277,
+     557,   558,   560,   561,   559,   562,   563,   150,   564,   565,
+     567,   568,   570,   571,   197,   572,   573,   574,   575,   576,
+     577,   578,   579,   581,   633,   634,   635,   583,   584,   585,
+     589,   590,   130,   131,   586,   202,   587,   591,   376,   827,
+     840,   592,   354,   372,     1,     2,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,   203,
+     829,   841,   593,   355,   594,   373,   595,    99,   597,   598,
+     599,   600,   601,   602,   603,    99,   605,   606,   609,   607,
+     610,   613,   612,   614,   830,   842,   615,   356,   341,   342,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,   616,   619,   620,   623,   624,   617,   618,   147,   148,
+     621,   622,   627,   628,   697,   630,   631,   632,   891,   636,
+     637,   638,   639,   640,   641,   643,   644,   645,   793,   642,
+      34,   654,   655,   656,   713,   648,   657,    99,   659,   658,
+     660,   661,   667,   668,   662,   663,   664,   666,   669,   670,
+     672,   673,   674,   712,   675,   676,   679,   759,   678,   763,
+     767,   680,   771,   775,   797,   681,   800,   804,   848,   682,
+     852,   686,   687,   688,   689,   690,   691,   704,   856,   873,
+     874,   692,   875,   876,   693,   877,   879,   880,   694,   884,
+     885,   695,   886,   892,  1119,   696,   698,   894,   895,   897,
+     898,   699,   700,   711,   900,   901,   903,   904,   962,   907,
+     918,   917,   920,   921,   949,   922,   923,   924,   925,   926,
+     927,   932,   933,   934,   945,   950,   952,   953,   961,   955,
+     957,   956,   958,   959,   960,   963,   964,   965,   966,   967,
+     969,   968,   970,   971,  1013,   972,  1040,  1041,   973,  1046,
+    1047,  1063,  1083,  1033,   974,  1034,  1062,  1035,  1068,  1084,
+    1036,  1089,  1037,  1038,  1042,  1043,  1044,  1074,  1075,   214,
+    1076,  1077,   300,   215,  1078,   319,  1079,  1080,   984,  1090,
+     321,   241,   985,   322,  1087,   236,  1091,  1092,  1098,  1017,
+     238,  1102,   278,   314,  1006,   336,   332,   216,  1099,  1007,
+    1111,  1114,  1112,   217,  1116,  1019,   986,   218,   279,  1121,
+    1020,   827,   987,   280,   239,   840,   988,   315,  1052,  1139,
+     333,   219,  1100,  1008,   244,   301,   220,   258,   320,   221,
+     989,   996,   829,  1115,  1021,   990,   841,   281,   991,  1054,
+     247,  1000,  1018,   261,  1140,   251,   222,  1001,   262,  1106,
+     223,  1109,  1141,   224,  1118,   992,   830,  1144,   225,   993,
+     842,   233,   994,  1055,  1145,  1120,   714,   995,  1149,   252,
+    1002,  1053,   263,   785,  1146,   717,  1147,   665,   566,   864,
+     977,   975,  1014,   569,  1012,  1011,  1039,   245,  1032,  1031,
+     259,   611,   979,   246,   978,  1110,   260,   292,   981,  1010,
+     983,   980,   604,   608,  1065,   982,  1029,   580,  1067,  1064,
+    1066,   861,   582,  1113,  1048,   847,  1030,  1028,  1045,   625,
+     716,   588,   523,   629,   626,  1061,  1137,   715,  1117,  1148,
+       0,     0,   596,     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,   982,
-       0,     0,     0,   983,     0,  1015,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   984,     0,  1005,  1050,     0,
-       0,     0,     0,  1018,     0,     0,     0,   994,     0,     0,
-       0,     0,     0,  1016,     0,   985,  1052,     0,     0,     0,
-       0,     0,   986,   987,     0,     0,  1051,     0,     0,     0,
-       0,     0,     0,   988,     0,     0,   989,     0,  1006,     0,
-       0,     0,     0,     0,  1019,     0,     0,     0,     0,     0,
-    1004,     0,     0,     0,   990,     0,  1017,  1053,     0,     0,
-       0,     0,   991,     0,     0,   992,   993,  1000,   998,     0,
-       0,     0,   999
+       0,   984,     0,     0,     0,   985,     0,  1017,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1006,     0,     0,
+    1052,     0,  1007,  1019,     0,     0,     0,     0,  1020,   986,
+       0,     0,     0,     0,     0,   987,     0,     0,     0,   988,
+       0,  1054,     0,     0,     0,     0,  1008,     0,     0,     0,
+       0,     0,  1021,   989,   996,     0,     0,     0,   990,     0,
+    1018,   991,     0,     0,  1000,  1055,     0,     0,     0,     0,
+    1001,     0,     0,  1053,     0,     0,     0,     0,   992,     0,
+       0,     0,   993,     0,     0,   994,     0,     0,     0,     0,
+     995,     0,     0,  1002
   };
 
   const short
   Dhcp6Parser::yycheck_[] =
   {
       74,    75,    76,    77,    78,    79,    80,    77,    82,    83,
-      84,    85,    17,   661,    83,    83,   655,    77,   638,    77,
-      76,    77,    78,    79,    80,    86,    82,    83,   900,    85,
-     900,   900,   900,   900,    10,   100,    82,    83,     0,    77,
-       7,     5,   107,     7,     3,     9,    77,    77,   181,     8,
-     102,   544,   109,   110,     7,    59,     7,    77,    16,    17,
-      77,    76,    77,    78,    79,    80,   559,    82,    83,     7,
-      85,   573,    76,    77,    77,    78,    79,    80,    77,   119,
-     120,   121,    21,   585,   586,   587,    77,     3,    57,    77,
-      77,    77,     8,    78,    79,    21,     3,    78,    79,     6,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    58,    76,    77,
-      59,     7,    61,    62,   181,     7,    65,    66,    67,   181,
-      58,   102,   103,    59,   105,    76,    77,    76,    77,    58,
-      13,    14,    21,    71,    72,    73,    74,    75,    76,    77,
-      69,    30,   156,    94,   158,   159,     7,    76,    77,   100,
-     101,   102,   103,   104,   105,    58,    59,    95,     7,     7,
-      98,   148,   149,   150,   151,     3,    95,   181,   154,    98,
-       8,     3,     7,    76,    77,     3,     8,   163,   164,   165,
-       8,     3,    11,    12,     6,   155,    15,    76,    77,    18,
-      19,    20,     7,    96,    97,   181,     7,   184,    76,    77,
-       7,  1083,     7,  1083,  1083,  1083,  1083,   181,   182,   183,
-     184,   109,   110,   181,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-     181,     6,   181,   122,   123,   124,   125,   112,   113,   114,
-     115,   116,   117,   181,     3,   181,     3,    76,    77,     8,
-     128,   129,   181,     3,    83,     8,     6,   906,   888,    88,
-      89,    90,    91,    92,   157,    94,     3,   160,   161,   162,
-      99,     8,     3,     3,     3,   933,     6,     8,   181,   108,
-      76,    77,   111,     3,     3,     3,     3,     6,     8,   118,
-       8,     8,   181,     4,     3,     3,     8,   126,   127,     8,
-       8,   130,   131,   181,     3,   145,   146,     4,   392,     8,
-      59,    60,    61,    62,    63,    64,     3,     3,     3,     3,
-       3,     8,     8,     8,     8,     8,   155,    76,    77,     3,
-       3,     8,     4,     4,     8,     8,   132,   133,   134,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,     4,
-     434,     4,   181,     3,   438,     3,   152,   153,     8,     3,
-       8,     4,     4,     4,     8,     4,   450,   382,   383,   453,
-     450,     4,   438,     3,     3,     3,   460,     4,     8,     8,
-     450,     4,   450,     3,   450,   181,   470,   453,     8,     4,
-       3,     8,     3,     3,   460,     8,   480,     8,     4,     4,
-       4,   485,   450,     4,   470,     4,   485,   485,     4,   450,
-     450,     4,     4,   438,   480,    84,    85,    86,    87,   485,
-     450,   505,     4,   450,   480,   450,     4,     4,   453,   485,
-       3,   182,   181,     8,     4,   460,   507,   450,     4,   505,
-     453,   450,   181,     4,     4,   470,     4,   460,     4,   450,
-       4,     4,   450,   450,   450,   480,     4,   470,   453,     4,
-     485,     4,   453,     4,     4,   460,     4,     4,     4,   460,
-      22,    23,    24,    25,     4,     4,   182,   182,   182,   182,
-     505,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,   182,   182,   182,     4,    58,     4,     4,     4,
-       4,   182,   184,   518,   519,   520,    68,   183,    70,     4,
-       4,     4,     4,   183,    76,    77,    78,    79,    80,    81,
-      82,    83,     4,     4,     4,     4,     4,     4,     4,     4,
-     182,     4,     4,    95,     4,     4,    98,    99,     4,   184,
-       4,     4,     4,     4,   106,   629,     4,   182,   184,     4,
-       4,     4,   636,     4,     4,     4,   182,   182,   182,   630,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-     636,     4,     4,   182,     4,     4,   184,   661,   662,     4,
-     664,   184,   184,     4,   184,     4,   184,   182,     4,     4,
-       4,   606,   182,   182,     4,   661,   662,   184,   664,     4,
-       4,     4,     4,   182,     4,   181,     7,   181,     7,     7,
-       7,   636,     7,   628,     7,     5,     5,     5,     5,   181,
-       5,     7,   181,     5,     5,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,   661,   662,    56,   664,
-      58,    59,   166,   167,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,     5,    76,    77,
-       7,    79,    80,     5,    82,    83,     5,     5,   181,   181,
-       7,     7,     7,     7,     5,     5,     5,    95,     5,   181,
-      98,   181,     7,   181,   181,   181,     5,   147,   106,     7,
-     181,   181,   181,   181,   181,   181,   181,   181,   181,     7,
-       7,     7,     7,     7,     7,     7,     7,   181,     7,    93,
-     181,     7,     4,   181,   181,     4,   181,     4,     4,     4,
-       4,     4,   181,     4,   181,   181,     4,     4,     3,   181,
-       6,     3,     6,     6,     3,     6,     3,     3,     6,   184,
+      84,    85,    85,   663,    83,    77,   657,    83,   640,    77,
+      78,    79,    80,    76,    77,    78,    79,    80,   902,    82,
+      83,    77,    85,   902,    85,   902,   902,    77,   902,    10,
+       3,    77,    86,     6,   109,   110,     0,    76,    77,    78,
+      79,    80,   100,    82,    83,    77,    85,    16,    17,   107,
+      77,    82,    83,    77,    21,    59,   546,    78,    79,   102,
+       7,    17,     7,    78,    79,     5,     7,     7,     7,     9,
+      77,   561,    76,    77,    77,     3,   181,    77,     6,    11,
+      12,     7,    77,    15,     3,    77,    18,    19,    20,     8,
+       7,     3,    59,     7,    61,    62,     8,     7,    65,    66,
+      67,   148,   149,   150,   151,     7,   181,    76,    77,    76,
+      77,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,     7,    58,     3,
+       3,    58,    59,    21,     8,     8,     3,   184,   181,    69,
+       6,     8,    30,     3,    76,    77,    76,    77,     8,    76,
+      77,    83,   156,     7,   158,   159,    88,    89,    90,    91,
+      92,     3,    94,    76,    77,    95,     8,    99,    98,    96,
+      97,   102,   103,   154,   105,     3,   108,   181,   577,   111,
+       8,     7,   163,   164,   165,     7,   118,     7,    76,    77,
+     589,   590,   591,     3,   126,   127,     6,     3,   130,   131,
+     181,  1085,     8,   155,     3,     3,  1085,     6,  1085,  1085,
+       8,  1085,   181,     3,   181,   128,   129,    57,     8,     3,
+     152,   153,   157,   155,     8,   160,   161,   162,    59,    60,
+      61,    62,    63,    64,   122,   123,   124,   125,   119,   120,
+     121,   181,   182,   183,   184,    76,    77,     3,     3,   181,
+       3,   181,     8,     8,   181,     8,     4,   908,   890,   112,
+     113,   114,   115,   116,   117,     3,     3,     3,   181,     3,
+       8,    21,     8,     8,     8,   935,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,   181,    13,    14,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,     3,     3,    59,
+     394,    58,     8,     8,     3,     3,     3,     3,     8,     8,
+       8,    68,     8,    70,     3,    58,     4,     6,     4,    76,
+      77,    78,    79,    80,    81,    82,    83,     4,    71,    72,
+      73,    74,    75,    76,    77,   109,   110,     4,    95,     4,
+     181,    98,    99,     4,   438,     3,     3,     3,   442,   106,
+       8,     8,    95,     3,     3,    98,     3,     3,     8,     8,
+     454,     8,     8,   457,   454,    84,    85,    86,    87,   442,
+     464,     4,   454,   145,   146,     4,   454,     4,     4,   457,
+     474,   454,     4,     4,   457,     4,   464,     4,   454,     4,
+     484,   464,     4,   442,   454,   489,   474,     4,   454,     4,
+     489,   474,     4,   489,     4,   454,     4,     8,   457,     8,
+       4,   484,   454,   507,   507,   464,   489,   454,   384,   385,
+     454,   181,     3,     8,   181,   474,   457,    22,    23,    24,
+      25,     4,   457,   464,   507,   484,   507,   454,   181,   464,
+     489,   454,     4,   484,   454,   509,     3,   181,   489,   454,
+       4,     4,   454,     4,     4,     4,     4,     4,   507,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+       4,     4,    56,     4,    58,    59,     4,     4,     4,     4,
+       4,     4,    58,     4,     4,     4,     4,   182,   182,   182,
+     182,   182,    76,    77,   184,    79,    80,   182,    82,    83,
+      76,    77,   182,   182,     4,   183,     4,   183,   182,     4,
+       4,    95,     4,     4,    98,     4,     4,     4,    94,     4,
+       4,     4,   106,     4,   100,   101,   102,   103,   104,   105,
+       4,     4,     4,     4,   182,     4,     4,   631,     4,     4,
+       4,   184,     4,     4,   638,     4,     4,     4,   182,   184,
+       4,     4,     4,     4,   520,   521,   522,     4,   182,     4,
+       4,     4,    76,    77,   182,   638,   182,     4,   632,   663,
+     664,     4,   666,   666,   166,   167,   168,   169,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   638,
+     663,   664,     4,   666,     4,   666,     4,   181,     4,     4,
+     182,     4,     4,     4,   184,   181,     4,   184,     4,   184,
+       4,     4,   184,     4,   663,   664,   182,   666,   132,   133,
+     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,     4,     4,     4,     4,     4,   182,   182,   152,   153,
+     184,   184,     4,   182,   610,     4,     7,     7,     6,   181,
+       7,     7,     7,     7,     5,     5,     5,     5,    93,   181,
+       7,     5,     5,     5,   630,   181,     5,   181,     5,     7,
+       5,     5,   181,   181,     7,     7,     7,     7,     5,     5,
+       5,     5,   181,     5,   181,   181,     7,     7,   181,     7,
+       7,   181,     7,     7,     7,   181,     7,     7,     7,   181,
+       7,   181,   181,   181,   181,   181,   181,   147,     7,     4,
+       4,   181,     4,     4,   181,     4,     4,     4,   181,     4,
+       4,   181,     4,     3,     5,   181,   181,     6,     3,     6,
+       3,   181,   181,   181,     6,     3,     6,     3,   184,     6,
        3,     6,     6,     3,     6,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     3,   182,     6,     3,     6,     4,
-     182,     8,     6,   181,     4,     4,     4,   184,     4,   182,
-     182,   182,     4,     4,     4,   182,   182,     4,     4,     4,
-       4,     4,     3,     3,     6,     4,     4,   181,   184,   559,
-     182,   182,     8,     8,     8,     8,     4,     4,     4,   182,
-       4,     4,   182,   182,   182,   182,   182,   891,   182,   181,
-     894,   891,   181,   897,   181,   181,   900,   181,   897,   897,
-     900,   891,   181,   891,   181,   891,   181,   911,   894,   181,
-     914,   897,   900,   917,   900,   181,   181,   181,   894,   182,
-     181,   897,     5,   891,   900,   911,     7,     4,   914,   933,
-     891,   891,   900,   937,     4,   911,   940,   181,   184,   900,
-     900,   891,   946,     4,   891,   949,   891,   933,   184,   894,
-     900,   937,   897,   900,   940,   900,   654,   392,   891,   434,
-     946,   181,   891,   949,   940,   182,   911,   900,   182,   914,
-     891,   900,   636,   891,   891,   891,   629,   710,   911,   900,
-     890,   914,   900,   900,   900,   900,   438,   885,   933,   900,
-     909,   903,   937,   906,   919,   940,   488,   917,   926,   450,
-     893,   946,   902,  1083,   949,   891,    81,   948,   899,   896,
-     894,   480,   897,   946,   485,   946,   949,   453,   460,   951,
-     916,   675,   949,   470,  1089,   933,   511,   941,   937,   664,
-     630,   946,   914,   912,   949,   946,   635,   507,   949,   505,
-    1102,  1123,  1140,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       4,     4,     4,     4,   181,     3,     6,     3,   182,     8,
+       4,     6,     4,     4,     4,   182,   184,   182,     4,   182,
+       4,   182,     4,     4,     4,   182,     4,     4,   182,     4,
+       4,     3,     8,   182,   184,   182,     6,   182,     4,     8,
+     182,     4,   182,   182,   182,   182,   182,   181,   181,   893,
+     181,   181,   896,   893,   181,   899,   181,   181,   902,     8,
+     899,   893,   902,   899,   181,   893,     3,     8,   181,   913,
+     893,     4,   916,   896,   902,   919,   899,   893,   181,   902,
+       4,     4,   184,   893,     4,   913,   902,   893,   916,     7,
+     913,   935,   902,   916,   893,   939,   902,   896,   942,     4,
+     899,   893,   181,   902,   948,   896,   893,   951,   899,   893,
+     902,   902,   935,   182,   913,   902,   939,   916,   902,   942,
+     948,   902,   913,   951,     4,   948,   893,   902,   951,   181,
+     893,   181,     4,   893,   181,   902,   935,     4,   893,   902,
+     939,   893,   902,   942,   184,   181,   631,   902,   181,   948,
+     902,   942,   951,   656,   182,   638,   182,   561,   438,   712,
+     892,   887,   911,   442,   908,   905,   928,   948,   921,   919,
+     951,   492,   895,   948,   893,  1085,   951,    81,   898,   904,
+     901,   896,   484,   489,   950,   899,   916,   454,   953,   948,
+     951,   679,   457,  1091,   939,   666,   918,   914,   935,   507,
+     637,   464,   394,   513,   509,   943,  1125,   632,  1104,  1142,
+      -1,    -1,   474,    -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,  1083,
-      -1,    -1,    -1,  1083,    -1,  1089,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1083,    -1,  1083,  1102,    -1,
-      -1,    -1,    -1,  1089,    -1,    -1,    -1,  1083,    -1,    -1,
-      -1,    -1,    -1,  1089,    -1,  1083,  1102,    -1,    -1,    -1,
-      -1,    -1,  1083,  1083,    -1,    -1,  1102,    -1,    -1,    -1,
-      -1,    -1,    -1,  1083,    -1,    -1,  1083,    -1,  1083,    -1,
-      -1,    -1,    -1,    -1,  1089,    -1,    -1,    -1,    -1,    -1,
-    1083,    -1,    -1,    -1,  1083,    -1,  1089,  1102,    -1,    -1,
-      -1,    -1,  1083,    -1,    -1,  1083,  1083,  1083,  1083,    -1,
-      -1,    -1,  1083
+      -1,  1085,    -1,    -1,    -1,  1085,    -1,  1091,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1085,    -1,    -1,
+    1104,    -1,  1085,  1091,    -1,    -1,    -1,    -1,  1091,  1085,
+      -1,    -1,    -1,    -1,    -1,  1085,    -1,    -1,    -1,  1085,
+      -1,  1104,    -1,    -1,    -1,    -1,  1085,    -1,    -1,    -1,
+      -1,    -1,  1091,  1085,  1085,    -1,    -1,    -1,  1085,    -1,
+    1091,  1085,    -1,    -1,  1085,  1104,    -1,    -1,    -1,    -1,
+    1085,    -1,    -1,  1104,    -1,    -1,    -1,    -1,  1085,    -1,
+      -1,    -1,  1085,    -1,    -1,  1085,    -1,    -1,    -1,    -1,
+    1085,    -1,    -1,  1085
   };
 
   const unsigned short
@@ -4732,107 +4732,107 @@ namespace isc { namespace dhcp {
       15,    18,    19,    20,    43,    44,    45,    46,    47,    48,
       49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
       76,    77,    83,    88,    89,    90,    91,    92,    94,    99,
-     108,   111,   118,   126,   127,   130,   131,   155,   217,   226,
-     227,   228,   230,   231,   232,   233,   234,   235,   236,   237,
-     238,   239,   240,   241,   242,   244,   253,   255,   257,   294,
-     300,   306,   312,   314,   328,   338,   358,   363,   371,   397,
-     427,   429,   448,   478,   490,   502,   503,   511,   513,   551,
-     566,    16,    17,   217,   248,   249,   250,   252,   427,   429,
-      68,    70,    78,    79,    80,    81,    82,    95,    98,   106,
-     217,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   346,   347,   348,   350,   352,   354,   356,   358,
-     361,   362,   397,   415,   427,   429,   431,   448,   473,    69,
-     217,   354,   356,   397,   423,   424,   425,   427,   429,    71,
-      72,    73,    74,    75,   217,   354,   356,   397,   427,   429,
-     439,   440,   441,   443,   444,   446,   447,    94,   100,   101,
-     102,   103,   104,   105,   217,   397,   427,   429,   456,   457,
-     458,   459,   461,   463,   465,   467,   469,   471,   371,    21,
-      59,    61,    62,    65,    66,    67,   217,   275,   381,   382,
-     383,   384,   385,   386,   387,   389,   391,   393,   394,   396,
-     427,   429,    60,    63,    64,   217,   275,   385,   391,   405,
-     406,   407,   408,   409,   411,   412,   413,   414,   427,   429,
-     109,   110,   217,   322,   323,   324,   326,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     152,   153,   217,   427,   429,   517,   518,   519,   520,   522,
-     524,   525,   527,   528,   529,   532,   534,   535,   536,   539,
-     541,   543,   564,   565,   566,    13,    14,   555,   556,   557,
-     559,     6,     3,     4,     8,     3,   223,   561,   546,   548,
-     550,     4,     3,     8,   229,   552,   245,   254,   256,   258,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,   243,   339,   372,   398,   428,   430,   359,   364,
-     301,   313,   307,   295,   479,   449,   315,   329,   491,     4,
-     504,   512,   514,   567,     3,     8,   251,     4,     3,     8,
-     416,   432,   349,   351,   353,     4,     4,   357,   355,   474,
-       3,     8,   426,     3,     8,   442,     4,   445,     4,     4,
-       3,     8,   472,   460,   462,   464,   466,   468,   470,     8,
-       3,     8,   388,   276,     4,   392,   390,   395,     4,     8,
-       3,   410,     4,     4,     8,     3,   325,   327,     3,     8,
-       4,   521,   523,     4,   526,     4,     4,   530,   533,     4,
-       4,   537,   540,   542,   544,     3,     8,     3,     8,   558,
-       4,     3,     8,   202,   202,   181,     4,     4,     4,     4,
-       4,   221,     4,     4,     4,     4,     4,     4,   182,   182,
-     182,   182,   182,   182,   182,   182,   184,   183,   183,   182,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,   182,     4,     4,
-       4,     4,   227,     4,   184,   249,     4,     4,     4,     4,
-       4,   182,   184,     4,     4,     4,   347,     4,   424,     4,
-     182,     4,   182,   182,   440,     4,     4,     4,     4,     4,
-       4,     4,   458,     4,     4,   182,     4,     4,     4,   184,
-     383,     4,   184,   184,   407,     4,     4,   323,   184,     4,
-       4,   182,     4,   182,   182,     4,     4,   184,   184,     4,
-       4,     4,     4,   518,   565,     4,   182,   556,     4,     7,
-       7,   202,   202,   202,   181,     7,     7,     7,     7,     5,
-     181,     5,     5,     5,   204,   206,   181,    84,    85,    86,
-      87,   360,     5,     5,     5,     5,     7,     5,     5,     5,
-       7,     7,     7,   206,     7,     5,     5,   213,     5,     5,
-     181,   181,   181,   213,   181,     7,   181,   181,   181,   213,
-     213,   213,   181,   181,   181,   181,   181,   181,   181,   181,
-     181,   181,   181,   202,   181,   181,   181,   145,   146,   531,
-     147,   148,   149,   150,   151,   184,   538,   181,   181,   181,
-       5,   202,   226,   564,   555,   248,    21,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,   217,   263,   264,   265,   268,   270,
-     272,   274,   275,   277,   278,   279,   280,   281,   282,   283,
-     284,   285,   287,   288,   290,   292,   263,     7,   259,   260,
-     261,     7,   340,   341,   342,     7,   375,   376,   377,     7,
-     399,   400,   401,     7,   365,   366,   367,   102,   181,   302,
-     303,   304,   305,   211,   103,   105,   304,   308,   309,   310,
-     311,    93,   296,   297,   298,     7,   480,   481,     7,   450,
-     451,   452,     7,   316,   317,   318,   112,   113,   114,   115,
-     116,   117,   330,   331,   332,   333,   334,   335,   336,   337,
-      21,   122,   123,   124,   125,   217,   277,   427,   429,   492,
-     493,   494,   497,   498,   500,   501,   128,   129,   217,   427,
-     429,   505,   506,   507,   509,   517,     7,   568,   569,   214,
-       7,   417,   418,   419,     7,   433,   434,   435,   107,   459,
-     475,   476,   259,     8,     8,     8,     8,   266,   269,   271,
-     273,     4,     4,     4,     4,     4,   286,     4,     4,   289,
-     291,   293,     4,     4,     4,     3,     8,     8,   262,     6,
-       3,   343,     6,     3,   378,     6,     3,   402,     6,     3,
-     368,     6,     3,     3,     6,     6,     3,     6,   299,     3,
-       8,   482,     3,     6,   453,     6,     3,   319,     6,     3,
-       4,     4,     4,     4,     4,     4,     3,     8,   495,   499,
-       4,     4,     4,     3,     8,   508,   510,     3,     8,     8,
-     570,     3,     6,   181,   215,   216,   420,     6,     3,   436,
-       6,     3,   477,     8,     6,     4,     4,     4,     4,   182,
-     184,   182,   184,   182,     4,   182,   182,     4,     4,     4,
-     182,   182,   184,   264,   263,   261,   346,   342,   381,   377,
-     405,   401,   217,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   275,   338,   350,   352,   354,   356,
-     358,   362,   369,   370,   397,   427,   429,   473,   367,   303,
-     309,     4,   297,    96,    97,   217,   275,   397,   427,   429,
-     483,   484,   485,   486,   487,   489,   481,   456,   452,   322,
-     318,   182,   182,   182,   182,   182,   182,   331,     4,     4,
-     182,   182,   182,   493,     4,     4,   506,   156,   158,   159,
-     217,   275,   427,   429,   571,   572,   573,   574,   576,   569,
-       6,     3,   423,   419,   439,   435,     4,    22,    23,    24,
-      25,   267,   181,   181,   181,   181,   181,   181,   181,     8,
-       8,     8,     8,     3,     8,   181,   488,     4,     8,     3,
-       8,     8,   119,   120,   121,   496,   181,   181,   181,   577,
-       4,   575,     3,     8,   181,     8,     8,   181,   370,     4,
-     184,   485,     4,   182,     4,   572,   181,     5,   181,     7,
-     578,   579,   580,     3,     6,   157,   160,   161,   162,   581,
-     582,   583,   585,   586,   587,   579,   584,     4,     4,     4,
-       3,     8,     4,   184,   182,   182,   582,   181
+     108,   111,   118,   126,   127,   130,   131,   152,   153,   155,
+     217,   226,   227,   228,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   244,   253,   255,
+     257,   294,   300,   306,   312,   314,   328,   338,   358,   363,
+     371,   397,   427,   429,   448,   478,   490,   502,   503,   511,
+     513,   541,   543,   551,   566,    16,    17,   217,   248,   249,
+     250,   252,   427,   429,    68,    70,    78,    79,    80,    81,
+      82,    95,    98,   106,   217,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   346,   347,   348,   350,
+     352,   354,   356,   358,   361,   362,   397,   415,   427,   429,
+     431,   448,   473,    69,   217,   354,   356,   397,   423,   424,
+     425,   427,   429,    71,    72,    73,    74,    75,   217,   354,
+     356,   397,   427,   429,   439,   440,   441,   443,   444,   446,
+     447,    94,   100,   101,   102,   103,   104,   105,   217,   397,
+     427,   429,   456,   457,   458,   459,   461,   463,   465,   467,
+     469,   471,   371,    21,    59,    61,    62,    65,    66,    67,
+     217,   275,   381,   382,   383,   384,   385,   386,   387,   389,
+     391,   393,   394,   396,   427,   429,    60,    63,    64,   217,
+     275,   385,   391,   405,   406,   407,   408,   409,   411,   412,
+     413,   414,   427,   429,   109,   110,   217,   322,   323,   324,
+     326,   132,   133,   134,   135,   136,   137,   138,   139,   140,
+     141,   142,   143,   144,   217,   427,   429,   517,   518,   519,
+     520,   522,   524,   525,   527,   528,   529,   532,   534,   535,
+     536,   539,   541,   543,   564,   565,   566,    13,    14,   555,
+     556,   557,   559,     6,     3,     4,     8,     3,   223,   561,
+     546,   548,   550,     4,     3,     8,   229,   552,   245,   254,
+     256,   258,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,   243,   339,   372,   398,   428,   430,
+     359,   364,   301,   313,   307,   295,   479,   449,   315,   329,
+     491,     4,   504,   512,   514,   542,   544,   567,     3,     8,
+     251,     4,     3,     8,   416,   432,   349,   351,   353,     4,
+       4,   357,   355,   474,     3,     8,   426,     3,     8,   442,
+       4,   445,     4,     4,     3,     8,   472,   460,   462,   464,
+     466,   468,   470,     8,     3,     8,   388,   276,     4,   392,
+     390,   395,     4,     8,     3,   410,     4,     4,     8,     3,
+     325,   327,     3,     8,     4,   521,   523,     4,   526,     4,
+       4,   530,   533,     4,     4,   537,   540,     3,     8,     3,
+       8,   558,     4,     3,     8,   202,   202,   181,     4,     4,
+       4,     4,     4,   221,     4,     4,     4,     4,     4,     4,
+     182,   182,   182,   182,   182,   182,   182,   182,   184,   183,
+     183,   182,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,   182,
+       4,     4,     4,     4,     4,     4,   227,     4,   184,   249,
+       4,     4,     4,     4,     4,   182,   184,     4,     4,     4,
+     347,     4,   424,     4,   182,     4,   182,   182,   440,     4,
+       4,     4,     4,     4,     4,     4,   458,     4,     4,   182,
+       4,     4,     4,   184,   383,     4,   184,   184,   407,     4,
+       4,   323,   184,     4,     4,   182,     4,   182,   182,     4,
+       4,   184,   184,     4,     4,   518,   565,     4,   182,   556,
+       4,     7,     7,   202,   202,   202,   181,     7,     7,     7,
+       7,     5,   181,     5,     5,     5,   204,   206,   181,    84,
+      85,    86,    87,   360,     5,     5,     5,     5,     7,     5,
+       5,     5,     7,     7,     7,   206,     7,   181,   181,     5,
+       5,   213,     5,     5,   181,   181,   181,   213,   181,     7,
+     181,   181,   181,   213,   213,   213,   181,   181,   181,   181,
+     181,   181,   181,   181,   181,   181,   181,   202,   181,   181,
+     181,   145,   146,   531,   147,   148,   149,   150,   151,   184,
+     538,   181,     5,   202,   226,   564,   555,   248,    21,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,   217,   263,   264,   265,
+     268,   270,   272,   274,   275,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,   287,   288,   290,   292,   263,     7,
+     259,   260,   261,     7,   340,   341,   342,     7,   375,   376,
+     377,     7,   399,   400,   401,     7,   365,   366,   367,   102,
+     181,   302,   303,   304,   305,   211,   103,   105,   304,   308,
+     309,   310,   311,    93,   296,   297,   298,     7,   480,   481,
+       7,   450,   451,   452,     7,   316,   317,   318,   112,   113,
+     114,   115,   116,   117,   330,   331,   332,   333,   334,   335,
+     336,   337,    21,   122,   123,   124,   125,   217,   277,   427,
+     429,   492,   493,   494,   497,   498,   500,   501,   128,   129,
+     217,   427,   429,   505,   506,   507,   509,   517,     7,   568,
+     569,   214,     7,   417,   418,   419,     7,   433,   434,   435,
+     107,   459,   475,   476,   259,     8,     8,     8,     8,   266,
+     269,   271,   273,     4,     4,     4,     4,     4,   286,     4,
+       4,   289,   291,   293,     4,     4,     4,     3,     8,     8,
+     262,     6,     3,   343,     6,     3,   378,     6,     3,   402,
+       6,     3,   368,     6,     3,     3,     6,     6,     3,     6,
+     299,     3,     8,   482,     3,     6,   453,     6,     3,   319,
+       6,     3,     4,     4,     4,     4,     4,     4,     3,     8,
+     495,   499,     4,     4,     4,     3,     8,   508,   510,     3,
+       8,     8,   570,     3,     6,   181,   215,   216,   420,     6,
+       3,   436,     6,     3,   477,     8,     6,     4,     4,     4,
+       4,   182,   184,   182,   184,   182,     4,   182,   182,     4,
+       4,     4,   182,   182,   184,   264,   263,   261,   346,   342,
+     381,   377,   405,   401,   217,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   275,   338,   350,   352,
+     354,   356,   358,   362,   369,   370,   397,   427,   429,   473,
+     367,   303,   309,     4,   297,    96,    97,   217,   275,   397,
+     427,   429,   483,   484,   485,   486,   487,   489,   481,   456,
+     452,   322,   318,   182,   182,   182,   182,   182,   182,   331,
+       4,     4,   182,   182,   182,   493,     4,     4,   506,   156,
+     158,   159,   217,   275,   427,   429,   571,   572,   573,   574,
+     576,   569,     6,     3,   423,   419,   439,   435,     4,    22,
+      23,    24,    25,   267,   181,   181,   181,   181,   181,   181,
+     181,     8,     8,     8,     8,     3,     8,   181,   488,     4,
+       8,     3,     8,     8,   119,   120,   121,   496,   181,   181,
+     181,   577,     4,   575,     3,     8,   181,     8,     8,   181,
+     370,     4,   184,   485,     4,   182,     4,   572,   181,     5,
+     181,     7,   578,   579,   580,     3,     6,   157,   160,   161,
+     162,   581,   582,   583,   585,   586,   587,   579,   584,     4,
+       4,     4,     3,     8,     4,   184,   182,   182,   582,   181
   };
 
   const unsigned short
@@ -4849,66 +4849,66 @@ namespace isc { namespace dhcp {
      227,   227,   227,   227,   227,   227,   227,   227,   227,   227,
      227,   227,   227,   227,   227,   227,   227,   227,   227,   227,
      227,   227,   227,   227,   227,   227,   227,   227,   227,   227,
-     227,   227,   227,   227,   227,   227,   227,   229,   228,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   243,   242,   245,   244,   247,   246,   248,   248,   249,
-     249,   249,   249,   249,   251,   250,   252,   254,   253,   256,
-     255,   258,   257,   259,   259,   260,   260,   262,   261,   263,
-     263,   264,   264,   264,   264,   264,   264,   264,   264,   264,
+     227,   227,   227,   227,   227,   227,   227,   227,   227,   229,
+     228,   230,   231,   232,   233,   234,   235,   236,   237,   238,
+     239,   240,   241,   243,   242,   245,   244,   247,   246,   248,
+     248,   249,   249,   249,   249,   249,   251,   250,   252,   254,
+     253,   256,   255,   258,   257,   259,   259,   260,   260,   262,
+     261,   263,   263,   264,   264,   264,   264,   264,   264,   264,
      264,   264,   264,   264,   264,   264,   264,   264,   264,   264,
-     264,   266,   265,   267,   267,   267,   267,   269,   268,   271,
-     270,   273,   272,   274,   276,   275,   277,   278,   279,   280,
-     281,   282,   283,   284,   286,   285,   287,   289,   288,   291,
-     290,   293,   292,   295,   294,   296,   296,   297,   299,   298,
-     301,   300,   302,   302,   303,   303,   304,   305,   307,   306,
-     308,   308,   309,   309,   309,   310,   311,   313,   312,   315,
-     314,   316,   316,   317,   317,   319,   318,   321,   320,   322,
-     322,   322,   323,   323,   325,   324,   327,   326,   329,   328,
-     330,   330,   331,   331,   331,   331,   331,   331,   332,   333,
-     334,   335,   336,   337,   339,   338,   340,   340,   341,   341,
-     343,   342,   345,   344,   346,   346,   347,   347,   347,   347,
+     264,   264,   264,   266,   265,   267,   267,   267,   267,   269,
+     268,   271,   270,   273,   272,   274,   276,   275,   277,   278,
+     279,   280,   281,   282,   283,   284,   286,   285,   287,   289,
+     288,   291,   290,   293,   292,   295,   294,   296,   296,   297,
+     299,   298,   301,   300,   302,   302,   303,   303,   304,   305,
+     307,   306,   308,   308,   309,   309,   309,   310,   311,   313,
+     312,   315,   314,   316,   316,   317,   317,   319,   318,   321,
+     320,   322,   322,   322,   323,   323,   325,   324,   327,   326,
+     329,   328,   330,   330,   331,   331,   331,   331,   331,   331,
+     332,   333,   334,   335,   336,   337,   339,   338,   340,   340,
+     341,   341,   343,   342,   345,   344,   346,   346,   347,   347,
      347,   347,   347,   347,   347,   347,   347,   347,   347,   347,
      347,   347,   347,   347,   347,   347,   347,   347,   347,   347,
-     347,   347,   347,   349,   348,   351,   350,   353,   352,   355,
-     354,   357,   356,   359,   358,   360,   360,   360,   360,   361,
-     362,   364,   363,   365,   365,   366,   366,   368,   367,   369,
-     369,   370,   370,   370,   370,   370,   370,   370,   370,   370,
+     347,   347,   347,   347,   347,   349,   348,   351,   350,   353,
+     352,   355,   354,   357,   356,   359,   358,   360,   360,   360,
+     360,   361,   362,   364,   363,   365,   365,   366,   366,   368,
+     367,   369,   369,   370,   370,   370,   370,   370,   370,   370,
      370,   370,   370,   370,   370,   370,   370,   370,   370,   370,
-     370,   370,   370,   370,   370,   372,   371,   374,   373,   375,
-     375,   376,   376,   378,   377,   380,   379,   381,   381,   382,
-     382,   383,   383,   383,   383,   383,   383,   383,   383,   383,
-     383,   384,   385,   386,   388,   387,   390,   389,   392,   391,
-     393,   395,   394,   396,   398,   397,   399,   399,   400,   400,
-     402,   401,   404,   403,   405,   405,   406,   406,   407,   407,
-     407,   407,   407,   407,   407,   407,   407,   408,   410,   409,
-     411,   412,   413,   414,   416,   415,   417,   417,   418,   418,
-     420,   419,   422,   421,   423,   423,   424,   424,   424,   424,
-     424,   424,   424,   426,   425,   428,   427,   430,   429,   432,
-     431,   433,   433,   434,   434,   436,   435,   438,   437,   439,
-     439,   440,   440,   440,   440,   440,   440,   440,   440,   440,
-     440,   440,   442,   441,   443,   445,   444,   446,   447,   449,
-     448,   450,   450,   451,   451,   453,   452,   455,   454,   456,
-     456,   457,   457,   458,   458,   458,   458,   458,   458,   458,
-     458,   458,   458,   458,   460,   459,   462,   461,   464,   463,
-     466,   465,   468,   467,   470,   469,   472,   471,   474,   473,
-     475,   475,   477,   476,   479,   478,   480,   480,   482,   481,
-     483,   483,   484,   484,   485,   485,   485,   485,   485,   485,
-     485,   486,   488,   487,   489,   491,   490,   492,   492,   493,
-     493,   493,   493,   493,   493,   493,   493,   493,   495,   494,
-     496,   496,   496,   497,   499,   498,   500,   501,   502,   504,
-     503,   505,   505,   506,   506,   506,   506,   506,   508,   507,
-     510,   509,   512,   511,   514,   513,   516,   515,   517,   517,
+     370,   370,   370,   370,   370,   370,   370,   372,   371,   374,
+     373,   375,   375,   376,   376,   378,   377,   380,   379,   381,
+     381,   382,   382,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   384,   385,   386,   388,   387,   390,   389,
+     392,   391,   393,   395,   394,   396,   398,   397,   399,   399,
+     400,   400,   402,   401,   404,   403,   405,   405,   406,   406,
+     407,   407,   407,   407,   407,   407,   407,   407,   407,   408,
+     410,   409,   411,   412,   413,   414,   416,   415,   417,   417,
+     418,   418,   420,   419,   422,   421,   423,   423,   424,   424,
+     424,   424,   424,   424,   424,   426,   425,   428,   427,   430,
+     429,   432,   431,   433,   433,   434,   434,   436,   435,   438,
+     437,   439,   439,   440,   440,   440,   440,   440,   440,   440,
+     440,   440,   440,   440,   442,   441,   443,   445,   444,   446,
+     447,   449,   448,   450,   450,   451,   451,   453,   452,   455,
+     454,   456,   456,   457,   457,   458,   458,   458,   458,   458,
+     458,   458,   458,   458,   458,   458,   460,   459,   462,   461,
+     464,   463,   466,   465,   468,   467,   470,   469,   472,   471,
+     474,   473,   475,   475,   477,   476,   479,   478,   480,   480,
+     482,   481,   483,   483,   484,   484,   485,   485,   485,   485,
+     485,   485,   485,   486,   488,   487,   489,   491,   490,   492,
+     492,   493,   493,   493,   493,   493,   493,   493,   493,   493,
+     495,   494,   496,   496,   496,   497,   499,   498,   500,   501,
+     502,   504,   503,   505,   505,   506,   506,   506,   506,   506,
+     508,   507,   510,   509,   512,   511,   514,   513,   516,   515,
+     517,   517,   518,   518,   518,   518,   518,   518,   518,   518,
      518,   518,   518,   518,   518,   518,   518,   518,   518,   518,
-     518,   518,   518,   518,   518,   518,   518,   518,   519,   521,
-     520,   523,   522,   524,   526,   525,   527,   528,   530,   529,
-     531,   531,   533,   532,   534,   535,   537,   536,   538,   538,
-     538,   538,   538,   540,   539,   542,   541,   544,   543,   546,
-     545,   548,   547,   550,   549,   552,   551,   554,   553,   555,
-     555,   556,   556,   558,   557,   559,   561,   560,   563,   562,
-     564,   564,   565,   567,   566,   568,   568,   570,   569,   571,
-     571,   572,   572,   572,   572,   572,   572,   572,   573,   575,
-     574,   577,   576,   578,   578,   580,   579,   581,   581,   582,
-     582,   582,   582,   584,   583,   585,   586,   587
+     519,   521,   520,   523,   522,   524,   526,   525,   527,   528,
+     530,   529,   531,   531,   533,   532,   534,   535,   537,   536,
+     538,   538,   538,   538,   538,   540,   539,   542,   541,   544,
+     543,   546,   545,   548,   547,   550,   549,   552,   551,   554,
+     553,   555,   555,   556,   556,   558,   557,   559,   561,   560,
+     563,   562,   564,   564,   565,   567,   566,   568,   568,   570,
+     569,   571,   571,   572,   572,   572,   572,   572,   572,   572,
+     573,   575,   574,   577,   576,   578,   578,   580,   579,   581,
+     581,   582,   582,   582,   582,   584,   583,   585,   586,   587
   };
 
   const unsigned char
@@ -4925,66 +4925,66 @@ namespace isc { namespace dhcp {
        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,     0,     4,     3,
-       3,     3,     3,     3,     3,     3,     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,     3,     3,     3,     3,     3,     3,     3,     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,
-       4,     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,     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,     4,     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,     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,     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,
-       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,     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,     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,     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,     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,     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,     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,     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,
+       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,
-       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,     6,     0,     4,     1,
-       3,     1,     1,     0,     6,     3,     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,     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,     6,     0,
+       4,     1,     3,     1,     1,     0,     6,     3,     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
   };
 
 
@@ -5160,66 +5160,66 @@ namespace isc { namespace dhcp {
      454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
      464,   465,   466,   467,   468,   469,   470,   471,   472,   473,
      474,   475,   476,   477,   478,   479,   480,   481,   482,   483,
-     484,   485,   486,   487,   488,   489,   490,   493,   493,   501,
-     506,   511,   516,   521,   526,   531,   536,   541,   546,   551,
-     556,   561,   561,   569,   569,   580,   580,   589,   590,   593,
-     594,   595,   596,   597,   600,   600,   610,   616,   616,   628,
-     628,   640,   640,   650,   651,   654,   655,   658,   658,   668,
-     669,   672,   673,   674,   675,   676,   677,   678,   679,   680,
+     484,   485,   486,   487,   488,   489,   490,   491,   492,   495,
+     495,   503,   508,   513,   518,   523,   528,   533,   538,   543,
+     548,   553,   558,   563,   563,   571,   571,   582,   582,   591,
+     592,   595,   596,   597,   598,   599,   602,   602,   612,   618,
+     618,   630,   630,   642,   642,   652,   653,   656,   657,   660,
+     660,   670,   671,   674,   675,   676,   677,   678,   679,   680,
      681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   694,   694,   701,   702,   703,   704,   707,   707,   715,
-     715,   723,   723,   731,   736,   736,   744,   749,   754,   759,
-     764,   769,   774,   779,   784,   784,   792,   797,   797,   805,
-     805,   813,   813,   821,   821,   831,   832,   834,   836,   836,
-     854,   854,   864,   865,   868,   869,   872,   877,   882,   882,
-     892,   893,   896,   897,   898,   901,   906,   913,   913,   923,
-     923,   933,   934,   937,   938,   941,   941,   951,   951,   961,
-     962,   963,   966,   967,   970,   970,   978,   978,   986,   986,
-     997,   998,  1001,  1002,  1003,  1004,  1005,  1006,  1009,  1014,
-    1019,  1024,  1029,  1034,  1042,  1042,  1055,  1056,  1059,  1060,
-    1067,  1067,  1093,  1093,  1104,  1105,  1109,  1110,  1111,  1112,
+     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,   786,   786,   794,   799,
+     799,   807,   807,   815,   815,   823,   823,   833,   834,   836,
+     838,   838,   856,   856,   866,   867,   870,   871,   874,   879,
+     884,   884,   894,   895,   898,   899,   900,   903,   908,   915,
+     915,   925,   925,   935,   936,   939,   940,   943,   943,   953,
+     953,   963,   964,   965,   968,   969,   972,   972,   980,   980,
+     988,   988,   999,  1000,  1003,  1004,  1005,  1006,  1007,  1008,
+    1011,  1016,  1021,  1026,  1031,  1036,  1044,  1044,  1057,  1058,
+    1061,  1062,  1069,  1069,  1095,  1095,  1106,  1107,  1111,  1112,
     1113,  1114,  1115,  1116,  1117,  1118,  1119,  1120,  1121,  1122,
     1123,  1124,  1125,  1126,  1127,  1128,  1129,  1130,  1131,  1132,
-    1133,  1134,  1135,  1138,  1138,  1146,  1146,  1154,  1154,  1162,
-    1162,  1170,  1170,  1180,  1180,  1187,  1188,  1189,  1190,  1193,
-    1198,  1206,  1206,  1217,  1218,  1222,  1223,  1226,  1226,  1234,
-    1235,  1238,  1239,  1240,  1241,  1242,  1243,  1244,  1245,  1246,
+    1133,  1134,  1135,  1136,  1137,  1140,  1140,  1148,  1148,  1156,
+    1156,  1164,  1164,  1172,  1172,  1182,  1182,  1189,  1190,  1191,
+    1192,  1195,  1200,  1208,  1208,  1219,  1220,  1224,  1225,  1228,
+    1228,  1236,  1237,  1240,  1241,  1242,  1243,  1244,  1245,  1246,
     1247,  1248,  1249,  1250,  1251,  1252,  1253,  1254,  1255,  1256,
-    1257,  1258,  1259,  1260,  1261,  1268,  1268,  1281,  1281,  1290,
-    1291,  1294,  1295,  1300,  1300,  1315,  1315,  1329,  1330,  1333,
-    1334,  1337,  1338,  1339,  1340,  1341,  1342,  1343,  1344,  1345,
-    1346,  1349,  1351,  1356,  1358,  1358,  1366,  1366,  1374,  1374,
-    1382,  1384,  1384,  1392,  1401,  1401,  1413,  1414,  1419,  1420,
-    1425,  1425,  1437,  1437,  1449,  1450,  1455,  1456,  1461,  1462,
-    1463,  1464,  1465,  1466,  1467,  1468,  1469,  1472,  1474,  1474,
-    1482,  1484,  1486,  1491,  1499,  1499,  1511,  1512,  1515,  1516,
-    1519,  1519,  1529,  1529,  1538,  1539,  1542,  1543,  1544,  1545,
-    1546,  1547,  1548,  1551,  1551,  1559,  1559,  1584,  1584,  1614,
-    1614,  1626,  1627,  1630,  1631,  1634,  1634,  1646,  1646,  1658,
-    1659,  1662,  1663,  1664,  1665,  1666,  1667,  1668,  1669,  1670,
-    1671,  1672,  1675,  1675,  1683,  1688,  1688,  1696,  1701,  1709,
-    1709,  1719,  1720,  1723,  1724,  1727,  1727,  1736,  1736,  1745,
-    1746,  1749,  1750,  1754,  1755,  1756,  1757,  1758,  1759,  1760,
-    1761,  1762,  1763,  1764,  1767,  1767,  1777,  1777,  1787,  1787,
-    1795,  1795,  1803,  1803,  1811,  1811,  1819,  1819,  1832,  1832,
-    1842,  1843,  1846,  1846,  1857,  1857,  1867,  1868,  1871,  1871,
-    1881,  1882,  1885,  1886,  1889,  1890,  1891,  1892,  1893,  1894,
-    1895,  1898,  1900,  1900,  1908,  1916,  1916,  1928,  1929,  1932,
-    1933,  1934,  1935,  1936,  1937,  1938,  1939,  1940,  1943,  1943,
-    1950,  1951,  1952,  1955,  1960,  1960,  1968,  1973,  1980,  1987,
-    1987,  1997,  1998,  2001,  2002,  2003,  2004,  2005,  2008,  2008,
-    2016,  2016,  2026,  2026,  2066,  2066,  2078,  2078,  2088,  2089,
-    2092,  2093,  2094,  2095,  2096,  2097,  2098,  2099,  2100,  2101,
-    2102,  2103,  2104,  2105,  2106,  2107,  2108,  2109,  2112,  2117,
-    2117,  2125,  2125,  2133,  2138,  2138,  2146,  2151,  2156,  2156,
-    2164,  2165,  2168,  2168,  2176,  2181,  2186,  2186,  2194,  2197,
-    2200,  2203,  2206,  2212,  2212,  2220,  2220,  2228,  2228,  2238,
-    2238,  2245,  2245,  2252,  2252,  2261,  2261,  2272,  2272,  2282,
-    2283,  2287,  2288,  2291,  2291,  2301,  2311,  2311,  2321,  2321,
-    2332,  2333,  2337,  2341,  2341,  2353,  2354,  2358,  2358,  2366,
-    2367,  2370,  2371,  2372,  2373,  2374,  2375,  2376,  2379,  2384,
-    2384,  2392,  2392,  2402,  2403,  2406,  2406,  2414,  2415,  2418,
-    2419,  2420,  2421,  2424,  2424,  2432,  2437,  2442
+    1257,  1258,  1259,  1260,  1261,  1262,  1263,  1270,  1270,  1283,
+    1283,  1292,  1293,  1296,  1297,  1302,  1302,  1317,  1317,  1331,
+    1332,  1335,  1336,  1339,  1340,  1341,  1342,  1343,  1344,  1345,
+    1346,  1347,  1348,  1351,  1353,  1358,  1360,  1360,  1368,  1368,
+    1376,  1376,  1384,  1386,  1386,  1394,  1403,  1403,  1415,  1416,
+    1421,  1422,  1427,  1427,  1439,  1439,  1451,  1452,  1457,  1458,
+    1463,  1464,  1465,  1466,  1467,  1468,  1469,  1470,  1471,  1474,
+    1476,  1476,  1484,  1486,  1488,  1493,  1501,  1501,  1513,  1514,
+    1517,  1518,  1521,  1521,  1531,  1531,  1540,  1541,  1544,  1545,
+    1546,  1547,  1548,  1549,  1550,  1553,  1553,  1561,  1561,  1586,
+    1586,  1616,  1616,  1628,  1629,  1632,  1633,  1636,  1636,  1648,
+    1648,  1660,  1661,  1664,  1665,  1666,  1667,  1668,  1669,  1670,
+    1671,  1672,  1673,  1674,  1677,  1677,  1685,  1690,  1690,  1698,
+    1703,  1711,  1711,  1721,  1722,  1725,  1726,  1729,  1729,  1738,
+    1738,  1747,  1748,  1751,  1752,  1756,  1757,  1758,  1759,  1760,
+    1761,  1762,  1763,  1764,  1765,  1766,  1769,  1769,  1779,  1779,
+    1789,  1789,  1797,  1797,  1805,  1805,  1813,  1813,  1821,  1821,
+    1834,  1834,  1844,  1845,  1848,  1848,  1859,  1859,  1869,  1870,
+    1873,  1873,  1883,  1884,  1887,  1888,  1891,  1892,  1893,  1894,
+    1895,  1896,  1897,  1900,  1902,  1902,  1910,  1918,  1918,  1930,
+    1931,  1934,  1935,  1936,  1937,  1938,  1939,  1940,  1941,  1942,
+    1945,  1945,  1952,  1953,  1954,  1957,  1962,  1962,  1970,  1975,
+    1982,  1989,  1989,  1999,  2000,  2003,  2004,  2005,  2006,  2007,
+    2010,  2010,  2018,  2018,  2028,  2028,  2068,  2068,  2080,  2080,
+    2090,  2091,  2094,  2095,  2096,  2097,  2098,  2099,  2100,  2101,
+    2102,  2103,  2104,  2105,  2106,  2107,  2108,  2109,  2110,  2111,
+    2114,  2119,  2119,  2127,  2127,  2135,  2140,  2140,  2148,  2153,
+    2158,  2158,  2166,  2167,  2170,  2170,  2178,  2183,  2188,  2188,
+    2196,  2199,  2202,  2205,  2208,  2214,  2214,  2222,  2222,  2230,
+    2230,  2240,  2240,  2247,  2247,  2254,  2254,  2263,  2263,  2274,
+    2274,  2284,  2285,  2289,  2290,  2293,  2293,  2303,  2313,  2313,
+    2323,  2323,  2334,  2335,  2339,  2343,  2343,  2355,  2356,  2360,
+    2360,  2368,  2369,  2372,  2373,  2374,  2375,  2376,  2377,  2378,
+    2381,  2386,  2386,  2394,  2394,  2404,  2405,  2408,  2408,  2416,
+    2417,  2420,  2421,  2422,  2423,  2426,  2426,  2434,  2439,  2444
   };
 
   // Print the state stack on the debug stream.
@@ -5256,7 +5256,7 @@ namespace isc { namespace dhcp {
 } } // isc::dhcp
 #line 5258 "dhcp6_parser.cc"
 
-#line 2447 "dhcp6_parser.yy"
+#line 2449 "dhcp6_parser.yy"
 
 
 void
diff --git a/src/bin/dhcp6/dhcp6_parser.h b/src/bin/dhcp6/dhcp6_parser.h
index 4c8de5488c..3feac2a89a 100644
--- a/src/bin/dhcp6/dhcp6_parser.h
+++ b/src/bin/dhcp6/dhcp6_parser.h
@@ -4029,7 +4029,7 @@ switch (yytype)
     enum
     {
       yyeof_ = 0,
-      yylast_ = 1102,     ///< Last index in yytable_.
+      yylast_ = 1103,     ///< Last index in yytable_.
       yynnts_ = 403,  ///< 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 149f972520..b5c0b27845 100644
--- a/src/bin/dhcp6/location.hh
+++ b/src/bin/dhcp6/location.hh
@@ -1,4 +1,4 @@
-// Generated 201906181715
+// Generated 201906181918
 // A Bison parser, made by GNU Bison 3.4.1.
 
 // Locations for Bison parsers in C++
diff --git a/src/bin/dhcp6/position.hh b/src/bin/dhcp6/position.hh
index 4640297fec..d916ca979d 100644
--- a/src/bin/dhcp6/position.hh
+++ b/src/bin/dhcp6/position.hh
@@ -1,4 +1,4 @@
-// Generated 201906181715
+// Generated 201906181918
 // A Bison parser, made by GNU Bison 3.4.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 5bfd9a6442..745ed190a6 100644
--- a/src/bin/dhcp6/stack.hh
+++ b/src/bin/dhcp6/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201906181715
+// Generated 201906181918
 // A Bison parser, made by GNU Bison 3.4.1.
 
 // Starting with Bison 3.2, this file is useless: the structure it