Added support for extended hostnames