Changes for the dhcp support