Updates for DHCP and Snapshot Feature