Improved speed of the builds and improved the key value validation
Improved the dhcp migrations