Added support for name servers