Adding more changes for DNS