Added support for whois