Whois: Modify Domain Handling