ND configured
Added better vlan support