More modification for domain name