Updated to include TLDs