diff --git a/tools/.generated-files.txt b/tools/.generated-files.txt
index 9950c085be..c9314561e4 100644
--- a/tools/.generated-files.txt
+++ b/tools/.generated-files.txt
@@ -1,7 +1,5 @@
 premium/src/hooks/dhcp/cb_cmds/cb_cmds_messages.cc
 premium/src/hooks/dhcp/cb_cmds/cb_cmds_messages.h
-premium/src/hooks/dhcp/cb_cmds/cb_parsers.cc
-premium/src/hooks/dhcp/cb_cmds/cb_parsers.h
 premium/src/hooks/dhcp/class_cmds/class_cmds_messages.cc
 premium/src/hooks/dhcp/class_cmds/class_cmds_messages.h
 premium/src/hooks/dhcp/flex_id/flex_id_messages.cc
@@ -23,28 +21,43 @@ src/bin/agent/agent_parser.cc
 src/bin/agent/agent_parser.h
 src/bin/agent/ca_messages.cc
 src/bin/agent/ca_messages.h
+src/bin/agent/location.hh
+src/bin/agent/position.hh
+src/bin/agent/stack.hh
 src/bin/d2/d2_lexer.cc
 src/bin/d2/d2_messages.cc
 src/bin/d2/d2_messages.h
 src/bin/d2/d2_parser.cc
 src/bin/d2/d2_parser.h
+src/bin/d2/location.hh
+src/bin/d2/position.hh
+src/bin/d2/stack.hh
 src/bin/dhcp4/dhcp4_lexer.cc
 src/bin/dhcp4/dhcp4_messages.cc
 src/bin/dhcp4/dhcp4_messages.h
 src/bin/dhcp4/dhcp4_parser.cc
 src/bin/dhcp4/dhcp4_parser.h
+src/bin/dhcp4/location.hh
+src/bin/dhcp4/position.hh
+src/bin/dhcp4/stack.hh
 src/bin/dhcp6/dhcp6_lexer.cc
 src/bin/dhcp6/dhcp6_messages.cc
 src/bin/dhcp6/dhcp6_messages.h
 src/bin/dhcp6/dhcp6_parser.cc
 src/bin/dhcp6/dhcp6_parser.h
+src/bin/dhcp6/location.hh
+src/bin/dhcp6/position.hh
+src/bin/dhcp6/stack.hh
 src/bin/lfc/lfc_messages.cc
 src/bin/lfc/lfc_messages.h
+src/bin/netconf/location.hh
 src/bin/netconf/netconf_lexer.cc
 src/bin/netconf/netconf_messages.cc
 src/bin/netconf/netconf_messages.h
 src/bin/netconf/netconf_parser.cc
 src/bin/netconf/netconf_parser.h
+src/bin/netconf/position.hh
+src/bin/netconf/stack.hh
 src/hooks/dhcp/bootp/bootp_messages.cc
 src/hooks/dhcp/bootp/bootp_messages.h
 src/hooks/dhcp/flex_option/flex_option_messages.cc
@@ -62,13 +75,10 @@ src/hooks/dhcp/user_chk/user_chk_messages.h
 src/lib/asiodns/asiodns_messages.cc
 src/lib/asiodns/asiodns_messages.h
 src/lib/cfgrpt/config_report.cc
-src/lib/cfgrpt/config_report.h
 src/lib/config/config_messages.cc
 src/lib/config/config_messages.h
 src/lib/database/db_messages.cc
 src/lib/database/db_messages.h
-src/lib/database/server_selector.cc
-src/lib/database/server_selector.h
 src/lib/dhcpsrv/alloc_engine_messages.cc
 src/lib/dhcpsrv/alloc_engine_messages.h
 src/lib/dhcpsrv/dhcpsrv_messages.cc
@@ -81,11 +91,17 @@ src/lib/dhcp_ddns/dhcp_ddns_messages.cc
 src/lib/dhcp_ddns/dhcp_ddns_messages.h
 src/lib/dns/rdataclass.cc
 src/lib/dns/rdataclass.h
+src/lib/dns/rrclass.h
+src/lib/dns/rrparamregistry.cc
+src/lib/dns/rrtype.h
 src/lib/eval/eval_messages.cc
 src/lib/eval/eval_messages.h
 src/lib/eval/lexer.cc
+src/lib/eval/location.hh
 src/lib/eval/parser.cc
 src/lib/eval/parser.h
+src/lib/eval/position.hh
+src/lib/eval/stack.hh
 src/lib/hooks/hooks_messages.cc
 src/lib/hooks/hooks_messages.h
 src/lib/http/http_messages.cc