Added WHOIS support