@@ -15,10 +15,11 @@
  * file.
  */
 
 #import "OFObject.h"
 #import "OFDNSResourceRecord.h"
+#import "OFDNSResponse.h"
 #import "OFRunLoop.h"
 #import "OFString.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
@@ -62,13 +63,10 @@
 	OF_DNS_RESOLVER_ERROR_SERVER_NOT_IMPLEMENTED,
 	/*! The server refused the query */
 	OF_DNS_RESOLVER_ERROR_SERVER_REFUSED
 } of_dns_resolver_error_t;
 
-typedef OFDictionary OF_GENERIC(OFString *,
-    OFArray OF_GENERIC(OFDNSResourceRecord *) *) *of_dns_resolver_records_t;
-
 /*!
  * @protocol OFDNSResolverDelegate OFDNSResolver.h ObjFW/OFDNSResolver.h
  *
  * @brief A delegate for OFDNSResolver.
  */
@@ -77,24 +75,17 @@
 /*!
  * @brief This method is called when a DNS resolver resolved a domain name.
  *
  * @param resolver The acting resolver
  * @param domainName The fully qualified domain name used to resolve the host
- * @param answerRecords The answer records from the name server, grouped by
- *			domain name
- * @param authorityRecords The authority records from the name server, grouped
- *			   by domain name
- * @param additionalRecords Additional records sent by the name server, grouped
- *			    by domain name
+ * @param response The response from the DNS server, or nil on error
  * @param exception An exception that happened during resolving, or nil on
  *		    success
  */
 -	(void)resolver: (OFDNSResolver *)resolver
   didResolveDomainName: (OFString *)domainName
-	 answerRecords: (nullable of_dns_resolver_records_t)answerRecords
-      authorityRecords: (nullable of_dns_resolver_records_t)authorityRecords
-     additionalRecords: (nullable of_dns_resolver_records_t)additionalRecords
+	      response: (nullable OFDNSResponse *)response
 	     exception: (nullable id)exception;
 
 /*!
  * @brief This method is called when a DNS resolver resolved a domain name to
  *	  socket addresses.