Update to allow FQDN as well as IPs