Add support for passing in DHCP template and other minor tweaks