Add additional hostname check