Adding support for hostnames and dns