Added support for more whois codes