diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractIqBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractIqBuilder.java
index 5eac12435..ad4c4101d 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractIqBuilder.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractIqBuilder.java
@@ -40,10 +40,12 @@ public abstract class AbstractIqBuilder<IB extends AbstractIqBuilder<IB>> extend
         super(stanzaId);
     }
 
+    // TODO: Deprecate and use corresponding method in IqData instead.
     public static IqData createResponse(IqView request) {
         return createResponse(request, IQ.ResponseType.result);
     }
 
+    // TODO: Deprecate and use corresponding method in IqData instead.
     public static IqData createErrorResponse(IqView request) {
         return createResponse(request, IQ.ResponseType.error);
     }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/IqData.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/IqData.java
index 18173ffeb..e20c70684 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/IqData.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/IqData.java
@@ -46,4 +46,12 @@ public final class IqData extends AbstractIqBuilder<IqData> {
     public Stanza build() {
         throw new UnsupportedOperationException();
     }
+
+    public static IqData createResponseData(IqView request) {
+        return createResponse(request, IQ.ResponseType.result);
+    }
+
+    public static IqData createErrorResponseDAta(IqView request) {
+        return createResponse(request, IQ.ResponseType.error);
+    }
 }