Added rudimentary domain name support