Updated to account for different TLDs