Support hostnames with hyphens