add support to auto resolve hostnames