added domain name support