Added dhcp vendor and various improvements