[TACHYON-16, 19] Improve Network, FQDN