New templates and additional whois servers