Added support for non-resolving hostnames