Hostname check added