Add supports for FQDN