Added host name discovery