You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ra...@apache.org on 2019/08/17 18:28:35 UTC

[mina-vysper] 01/01: StanzaHandler should be able to respond with multiple stanzas

This is an automated email from the ASF dual-hosted git repository.

ralaoui pushed a commit to branch handler-multiple-stanza-responses
in repository https://gitbox.apache.org/repos/asf/mina-vysper.git

commit 0e59bb50fc265cf900246f77530efaab6b4ac063
Author: Réda Housni Alaoui <re...@gmail.com>
AuthorDate: Sat Aug 17 20:28:24 2019 +0200

    StanzaHandler should be able to respond with multiple stanzas
---
 .../core/base/handler/DefaultIQHandler.java        | 55 +++++++++++++---------
 .../core/base/handler/DefaultMessageHandler.java   | 11 +++--
 .../core/base/handler/DefaultPresenceHandler.java  | 11 +++--
 .../xmpp/modules/core/base/handler/IQHandler.java  | 27 ++++++-----
 .../modules/core/base/handler/MessageHandler.java  |  6 ++-
 .../core/base/handler/RelayingIQHandler.java       | 21 +++++----
 .../core/base/handler/XMPPCoreStanzaHandler.java   | 16 +++----
 .../handler/async/AbstractAsyncIQGetHandler.java   |  7 +--
 .../modules/core/bind/handler/BindIQHandler.java   | 11 +++--
 .../handler/AuthCompatibilityIQHandler.java        | 11 +++--
 .../modules/core/im/handler/PresenceHandler.java   | 15 +++---
 .../core/session/handler/SessionIQHandler.java     |  9 ++--
 .../xep0049_privatedata/PrivateDataIQHandler.java  | 39 ++++++++-------
 .../AdhocCommandIQHandler.java                     | 32 ++++++-------
 .../xep0054_vcardtemp/VcardTempIQHandler.java      | 33 +++++++------
 .../InBandRegistrationHandler.java                 | 42 +++++------------
 .../SoftwareVersionIQHandler.java                  |  7 ++-
 .../xep0199_xmppping/XmppPingIQHandler.java        |  9 ++--
 .../xep0202_entity_time/EntityTimeIQHandler.java   |  6 ++-
 .../EntityTimeXEP0090IQHandler.java                |  6 ++-
 .../modules/roster/handler/RosterIQHandler.java    | 39 +++++++--------
 .../handler/DiscoInfoIQHandler.java                | 19 ++++----
 .../handler/DiscoItemIQHandler.java                | 17 +++----
 .../xmpp/protocol/ResponseStanzaContainer.java     | 12 ++++-
 .../xmpp/protocol/ResponseStanzaContainerImpl.java | 32 +++++++++++--
 .../vysper/xmpp/protocol/ResponseWriter.java       |  4 +-
 .../worker/AbstractStateAwareProtocolWorker.java   | 13 ++---
 .../worker/InboundStanzaProtocolWorker.java        |  8 ++--
 .../components/ComponentStanzaProcessor.java       | 17 ++++---
 .../server/s2s/DefaultXMPPServerConnector.java     |  2 +-
 .../core/base/handler/IQHandlerTestCase.java       |  8 ++--
 .../base/handler/RelayingIQHandlerTestCase.java    |  8 ++--
 .../modules/core/base/handler/TestIQHandler.java   |  9 ++--
 .../core/bind/handler/BindIQHandlerTestCase.java   | 20 +++++---
 .../AuthCompatibilityIQHandlerTestCase.java        |  6 +--
 .../PresenceAvailInitialOutHandlerTestCase.java    | 12 +++--
 .../core/sasl/handler/AbortHandlerTestCase.java    |  2 +-
 .../handler/AuthHandlerPlainMechanismTestCase.java |  8 ++--
 .../session/handler/SessionIQHandlerTestCase.java  |  2 +-
 .../starttls/handler/StartTLSHandlerTestCase.java  |  2 +-
 .../PrivateDataIQHandlerTestCase.java              | 20 ++++----
 .../VcardTempIQHandlerTestCase.java                | 18 +++----
 .../InBandRegistrationHandlerTestCase.java         | 12 ++---
 .../SoftwareVersionIQHandlerTestCase.java          |  6 ++-
 .../XmppPingIQHandlerTestCase.java                 | 24 +++++-----
 .../EntityTimeIQHandlerTestCase.java               |  6 ++-
 .../EntityTimeXEP0090IQHandlerTestCase.java        |  5 +-
 .../DbVerifyHandlerTestCase.java                   |  2 +-
 .../handler/DiscoInfoIQHandlerTestCase.java        | 46 +++++++++++-------
 .../handler/ExtendedDiscoInfoTestCase.java         |  9 ++--
 .../protocol/CallTestStanzaHandlerResponse.java    | 12 ++++-
 .../protocol/ProtocolWorkerProcessTestCase.java    |  2 +-
 .../xmpp/server/s2s/FeaturesHandlerTestCase.java   |  6 +--
 .../xep0045_muc/handler/MUCHandlerHelper.java      |  1 +
 .../xep0045_muc/handler/MUCIqAdminHandler.java     | 35 +++++++-------
 .../xep0045_muc/handler/MUCMessageHandler.java     | 15 +++---
 .../xep0045_muc/handler/MUCPresenceHandler.java    | 13 ++---
 .../xep0045_muc/AbstractDiscoTestCase.java         |  2 +-
 .../AbstractMUCOccupantDiscoTestCase.java          |  2 +-
 .../handler/AbstractMUCHandlerTestCase.java        |  2 +-
 .../handler/AbstractMUCMessageHandlerTestCase.java |  2 +-
 .../xep0045_muc/handler/ChangeNickTestCase.java    |  2 +-
 .../xep0045_muc/handler/ChangeStatusTestCase.java  |  2 +-
 .../xep0045_muc/handler/EnterRoomTestCase.java     |  2 +-
 .../xep0045_muc/handler/ExitRoomTestCase.java      |  2 +-
 .../handler/PubSubCreateNodeHandler.java           |  9 ++--
 .../handler/PubSubPublishHandler.java              | 11 +++--
 .../handler/PubSubRetrieveAffiliationsHandler.java |  5 +-
 .../PubSubRetrieveSubscriptionsHandler.java        |  4 +-
 .../handler/PubSubSubscribeHandler.java            | 13 +++--
 .../handler/PubSubUnsubscribeHandler.java          | 19 ++++----
 .../owner/PubSubOwnerDeleteNodeHandler.java        | 11 +++--
 .../PubSubOwnerManageAffiliationsHandler.java      | 25 +++++-----
 .../disco/PubSubDiscoInfoTestCase.java             |  4 +-
 .../disco/PubSubDiscoItemsTestCase.java            |  8 ++--
 .../handler/PubSubCreateNodeTestCase.java          |  4 +-
 .../handler/PubSubPublishTestCase.java             |  8 ++--
 .../PubSubRetrieveAffiliationsTestCase.java        |  4 +-
 .../PubSubRetrieveSubscriptionsTestCase.java       |  6 +--
 .../handler/PubSubSubscribeTestCase.java           | 10 ++--
 .../handler/PubSubUnsubscribeTestCase.java         | 14 +++---
 .../handler/owner/PubSubDeleteNodeTestCase.java    |  6 +--
 .../PubSubOwnerModifyAffiliationsTestCase.java     | 10 ++--
 .../PubSubOwnerRetrieveAffiliationsTestCase.java   |  6 +--
 .../extension/xep0065_socks/Socks5IqHandler.java   | 12 +++--
 .../xep0065_socks/Socks5IqHandlerTest.java         | 11 +++--
 86 files changed, 601 insertions(+), 461 deletions(-)

diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultIQHandler.java
index 9ed9a45..178846a 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultIQHandler.java
@@ -19,6 +19,9 @@
  */
 package org.apache.vysper.xmpp.modules.core.base.handler;
 
+import java.util.Collections;
+import java.util.List;
+
 import org.apache.vysper.xmpp.server.ServerRuntimeContext;
 import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.server.response.ServerErrorResponses;
@@ -55,8 +58,8 @@ public abstract class DefaultIQHandler extends IQHandler {
     }
 
     @Override
-    protected Stanza executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
-            SessionContext sessionContext) {
+    protected List<Stanza> executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
+            boolean outboundStanza, SessionContext sessionContext) {
 
         switch (stanza.getIQType()) {
         case ERROR:
@@ -73,34 +76,40 @@ public abstract class DefaultIQHandler extends IQHandler {
         }
     }
 
-    protected Stanza handleResult(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
+    protected List<Stanza> handleResult(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
             SessionContext sessionContext) {
-        logger.warn("IQ 'result' stanza not handled by {}: {}", getClass().getCanonicalName(), DenseStanzaLogRenderer
-                .render(stanza));
-        return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
-                StanzaErrorType.CANCEL, "iq stanza of type 'result' is not handled for this namespace",
-                getErrorLanguage(serverRuntimeContext, sessionContext), null);
+        logger.warn("IQ 'result' stanza not handled by {}: {}", getClass().getCanonicalName(),
+                DenseStanzaLogRenderer.render(stanza));
+        return Collections
+                .singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+                        StanzaErrorType.CANCEL, "iq stanza of type 'result' is not handled for this namespace",
+                        getErrorLanguage(serverRuntimeContext, sessionContext), null));
     }
 
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
-        logger.warn("IQ 'get' stanza not handled by {}: {}", getClass().getCanonicalName(), DenseStanzaLogRenderer
-                .render(stanza));
-        return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
-                StanzaErrorType.CANCEL, "iq stanza of type 'get' is not handled for this namespace",
-                getErrorLanguage(serverRuntimeContext, sessionContext), null);
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
+            SessionContext sessionContext) {
+        logger.warn("IQ 'get' stanza not handled by {}: {}", getClass().getCanonicalName(),
+                DenseStanzaLogRenderer.render(stanza));
+        return Collections
+                .singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+                        StanzaErrorType.CANCEL, "iq stanza of type 'get' is not handled for this namespace",
+                        getErrorLanguage(serverRuntimeContext, sessionContext), null));
     }
 
-    protected void handleError(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
-        logger.warn("IQ 'error' stanza not handled by {}: {}", getClass().getCanonicalName(), DenseStanzaLogRenderer
-                .render(stanza));
+    protected void handleError(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
+            SessionContext sessionContext) {
+        logger.warn("IQ 'error' stanza not handled by {}: {}", getClass().getCanonicalName(),
+                DenseStanzaLogRenderer.render(stanza));
         throw new RuntimeException("iq stanza type ERROR not yet handled");
     }
 
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
-        logger.warn("IQ 'set' stanza not handled by {}: {}", getClass().getCanonicalName(), DenseStanzaLogRenderer
-                .render(stanza));
-        return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
-                StanzaErrorType.CANCEL, "iq stanza of type 'set' is not handled for this namespace",
-                getErrorLanguage(serverRuntimeContext, sessionContext), null);
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
+            SessionContext sessionContext) {
+        logger.warn("IQ 'set' stanza not handled by {}: {}", getClass().getCanonicalName(),
+                DenseStanzaLogRenderer.render(stanza));
+        return Collections
+                .singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+                        StanzaErrorType.CANCEL, "iq stanza of type 'set' is not handled for this namespace",
+                        getErrorLanguage(serverRuntimeContext, sessionContext), null));
     }
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultMessageHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultMessageHandler.java
index e680c13..3666096 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultMessageHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultMessageHandler.java
@@ -20,6 +20,7 @@
 
 package org.apache.vysper.xmpp.modules.core.base.handler;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.xml.fragment.XMLElement;
@@ -60,8 +61,8 @@ public class DefaultMessageHandler extends XMPPCoreStanzaHandler {
     }
 
     @Override
-    protected Stanza executeCore(XMPPCoreStanza coreStanza, ServerRuntimeContext serverRuntimeContext,
-            boolean isOutboundStanza, SessionContext sessionContext) {
+    protected List<Stanza> executeCore(XMPPCoreStanza coreStanza, ServerRuntimeContext serverRuntimeContext,
+                                 boolean isOutboundStanza, SessionContext sessionContext) {
         MessageStanza stanza = (MessageStanza) coreStanza;
 
         return executeMessageLogic(stanza, serverRuntimeContext, sessionContext);
@@ -70,11 +71,11 @@ public class DefaultMessageHandler extends XMPPCoreStanzaHandler {
     /**
      * must be overridden by specialized message handlers
      */
-    protected Stanza executeMessageLogic(MessageStanza stanza, ServerRuntimeContext serverRuntimeContext,
+    protected List<Stanza> executeMessageLogic(MessageStanza stanza, ServerRuntimeContext serverRuntimeContext,
             SessionContext sessionContext) {
         // this is default behavior and must be replaced by overrider
-        return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
-                StanzaErrorType.CANCEL, null, null, null);
+        return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+                StanzaErrorType.CANCEL, null, null, null));
     }
 
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultPresenceHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultPresenceHandler.java
index 2fa4b22..91bc984 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultPresenceHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultPresenceHandler.java
@@ -20,6 +20,7 @@
 
 package org.apache.vysper.xmpp.modules.core.base.handler;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.xml.fragment.XMLElement;
@@ -60,8 +61,8 @@ public class DefaultPresenceHandler extends XMPPCoreStanzaHandler {
     }
 
     @Override
-    protected Stanza executeCore(XMPPCoreStanza coreStanza, ServerRuntimeContext serverRuntimeContext,
-            boolean isOutboundStanza, SessionContext sessionContext) {
+    protected List<Stanza> executeCore(XMPPCoreStanza coreStanza, ServerRuntimeContext serverRuntimeContext,
+                                 boolean isOutboundStanza, SessionContext sessionContext) {
         PresenceStanza stanza = (PresenceStanza) coreStanza;
 
         return executePresenceLogic(stanza, serverRuntimeContext, sessionContext);
@@ -70,11 +71,11 @@ public class DefaultPresenceHandler extends XMPPCoreStanzaHandler {
     /**
      * must be overridden by specialized presence handlers
      */
-    protected Stanza executePresenceLogic(PresenceStanza stanza, ServerRuntimeContext serverRuntimeContext,
+    protected List<Stanza> executePresenceLogic(PresenceStanza stanza, ServerRuntimeContext serverRuntimeContext,
             SessionContext sessionContext) {
         // this is default behavior and must be replaced by overrider
-        return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
-                StanzaErrorType.CANCEL, null, null, null);
+        return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+                StanzaErrorType.CANCEL, null, null, null));
     }
 
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java
index 585f07d..c9c9b12 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java
@@ -23,6 +23,7 @@ package org.apache.vysper.xmpp.modules.core.base.handler;
 import static org.apache.vysper.compliance.SpecCompliant.ComplianceCoverage.PARTIAL;
 import static org.apache.vysper.compliance.SpecCompliant.ComplianceStatus.FINISHED;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.compliance.SpecCompliance;
@@ -72,42 +73,42 @@ public class IQHandler extends XMPPCoreStanzaHandler {
             @SpecCompliant(spec = "rfc3920", section = "9.2.3", status = FINISHED, coverage = PARTIAL, comment = "covers points 1, 2, 5 and 6"),
             @SpecCompliant(spec = "rfc3920bis-09", section = "9.2.3", status = FINISHED, coverage = PARTIAL, comment = "covers points 1, 2, 5 and 6") })
     @Override
-    protected Stanza executeCore(XMPPCoreStanza coreStanza, ServerRuntimeContext serverRuntimeContext,
-            boolean isOutboundStanza, SessionContext sessionContext) {
+    protected List<Stanza> executeCore(XMPPCoreStanza coreStanza, ServerRuntimeContext serverRuntimeContext,
+                                 boolean isOutboundStanza, SessionContext sessionContext) {
         IQStanza stanza = (IQStanza) coreStanza;
 
         // rfc3920/9.2.3/1.
         String id = stanza.getID();
         if (id == null) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
                     StanzaErrorType.MODIFY, "iq-stanza requires 'id' attribute to be present",
-                    getErrorLanguage(serverRuntimeContext, sessionContext), null);
+                    getErrorLanguage(serverRuntimeContext, sessionContext), null));
         }
 
         // rfc3920/9.2.3/2.
         IQStanzaType iqType = stanza.getIQType();
         if (iqType == null) {
             // missing or unknown type
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
                     StanzaErrorType.MODIFY, "iq-stanza requires a valid 'type' attribute to be present",
-                    getErrorLanguage(serverRuntimeContext, sessionContext), null);
+                    getErrorLanguage(serverRuntimeContext, sessionContext), null));
         }
 
         if (iqType == IQStanzaType.GET || iqType == IQStanzaType.SET) {
             // assure, set or get contain one and only one element
             // rfc3920/9.2.3/5.
             if (!coreStanza.getVerifier().subElementsPresentExact(1)) {
-                return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+                return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
                         StanzaErrorType.MODIFY, "iq stanza of type get or set require exactly one child",
-                        getErrorLanguage(serverRuntimeContext, sessionContext), null);
+                        getErrorLanguage(serverRuntimeContext, sessionContext), null));
             }
         } else if (iqType == IQStanzaType.RESULT) {
             // assure, result contains zero or one element
             // rfc3920/9.2.3/6.
             if (!coreStanza.getVerifier().subElementsPresentAtMost(1)) {
-                return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+                return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
                         StanzaErrorType.MODIFY, "iq stanza of type result may not have more than one child",
-                        getErrorLanguage(serverRuntimeContext, sessionContext), null);
+                        getErrorLanguage(serverRuntimeContext, sessionContext), null));
             }
 
         } else if (iqType == IQStanzaType.ERROR) {
@@ -126,11 +127,11 @@ public class IQHandler extends XMPPCoreStanzaHandler {
     /**
      * must be overridden by specialized IQ handlers
      */
-    protected Stanza executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
+    protected List<Stanza> executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
             SessionContext sessionContext) {
         // this is default behavior and must be replaced by overrider
-        return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
-                StanzaErrorType.CANCEL, null, null, null);
+        return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+                StanzaErrorType.CANCEL, null, null, null));
     }
 
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandler.java
index f5ed4c8..c96d991 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandler.java
@@ -34,6 +34,8 @@ import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
 
+import java.util.List;
+
 /**
  * handling message stanzas
  *
@@ -50,8 +52,8 @@ public class MessageHandler extends XMPPCoreStanzaHandler {
     }
 
     @Override
-    protected Stanza executeCore(XMPPCoreStanza stanza, ServerRuntimeContext serverRuntimeContext,
-            boolean isOutboundStanza, SessionContext sessionContext) {
+    protected List<Stanza> executeCore(XMPPCoreStanza stanza, ServerRuntimeContext serverRuntimeContext,
+                                       boolean isOutboundStanza, SessionContext sessionContext) {
 
         // (try to) read thread id
         String threadId = null;
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
index af0b1e0..2fad3dc 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
@@ -37,25 +37,26 @@ import org.apache.vysper.xmpp.stanza.StanzaErrorType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * most IQ are targeted to the server. but sometimes, IQs are only routed through the server to another client.
  * this is the handler dealing with that. 
  */
 public class RelayingIQHandler extends IQHandler {
 
-    final Logger logger = LoggerFactory.getLogger(RelayingIQHandler.class);
-
     @Override
-    protected Stanza executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
-            SessionContext sessionContext) {
+    protected List<Stanza> executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
+                                          SessionContext sessionContext) {
         // only handle IQs which are not directed to the server (vysper.org).
         // in the case where an IQ is send to the server, StanzaHandlerLookup.getIQHandler is responsible for
         // looking it up and we shouldn't have been come here in the first place.
         // but we might will relay to a component (chat.vysper.org)
         Entity to = stanza.getTo();
         if (to == null || to.equals(sessionContext.getServerJID())) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED,
-                    stanza, StanzaErrorType.CANCEL, null, null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED,
+                    stanza, StanzaErrorType.CANCEL, null, null, null));
         }
 
         RosterManager rosterManager = RosterManagerUtils.getRosterInstance(serverRuntimeContext, sessionContext);
@@ -82,8 +83,8 @@ public class RelayingIQHandler extends IQHandler {
                 }
                 // deny relaying if neither isFromContact nor toComponent
                 if (!isFromContact && !toComponent) {
-                    return ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE,
-                            stanza, StanzaErrorType.CANCEL, null, null, null);
+                    return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE,
+                            stanza, StanzaErrorType.CANCEL, null, null, null));
                 }
 
                 Stanza forwardedStanza = StanzaBuilder.createForward(stanza, from, null).build();
@@ -110,8 +111,8 @@ public class RelayingIQHandler extends IQHandler {
             }
             // ...otherwise relaying is denied
             if (!isToContact && !fromComponent) {
-                return ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE,
-                        stanza, StanzaErrorType.CANCEL, null, null, null);
+                return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE,
+                        stanza, StanzaErrorType.CANCEL, null, null, null));
             }
 
             sessionContext.getResponseWriter().write(stanza);
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMPPCoreStanzaHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMPPCoreStanzaHandler.java
index d26630f..41631c8 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMPPCoreStanzaHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMPPCoreStanzaHandler.java
@@ -37,6 +37,8 @@ import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * foundation for the three core protocol stanzas: iq, message, presence
  *
@@ -114,17 +116,13 @@ public abstract class XMPPCoreStanzaHandler implements StanzaHandler {
             // TODO ensure, that RFC3920 9.1.1 "If the value of the 'to' attribute is invalid or cannot be contacted..." is enforced
         }
 
-        Stanza responseStanza = executeCore(stanza, serverRuntimeContext, isOutboundStanza, sessionContext);
-
-        if (responseStanza != null)
-            return new ResponseStanzaContainerImpl(responseStanza);
-
-        return null;
+        List<Stanza> responseStanzas = executeCore(stanza, serverRuntimeContext, isOutboundStanza, sessionContext);
+        return new ResponseStanzaContainerImpl(responseStanzas);
     }
 
-    protected abstract Stanza executeCore(XMPPCoreStanza stanza, ServerRuntimeContext serverRuntimeContext,
-            boolean isOutboundStanza, SessionContext sessionContext);
-
+    protected abstract List<Stanza> executeCore(XMPPCoreStanza stanza, ServerRuntimeContext serverRuntimeContext,
+                                                boolean isOutboundStanza, SessionContext sessionContext);
+    
     /**
      * Extracts the from address either from the "from" attribute of the stanza, if this isn't given
      * retracts to using the address of the initiating entity plus the resource of the sessionContext (if available).
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/async/AbstractAsyncIQGetHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/async/AbstractAsyncIQGetHandler.java
index 033d05d..31a37bc 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/async/AbstractAsyncIQGetHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/async/AbstractAsyncIQGetHandler.java
@@ -19,6 +19,7 @@
  */
 package org.apache.vysper.xmpp.modules.core.base.handler.async;
 
+import java.util.List;
 import java.util.concurrent.Executor;
 
 import org.apache.vysper.xmpp.modules.core.base.handler.IQHandler;
@@ -50,8 +51,8 @@ abstract public class AbstractAsyncIQGetHandler extends IQHandler {
             ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext);
 
     @Override
-    protected Stanza executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
-            SessionContext sessionContext) {
+    protected List<Stanza> executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
+                                          SessionContext sessionContext) {
         switch (stanza.getIQType()) {
         case GET:
             executeGetIQLogicAsync(stanza, serverRuntimeContext, sessionContext);
@@ -79,7 +80,7 @@ abstract public class AbstractAsyncIQGetHandler extends IQHandler {
      * override this method, if you want to handle other types than get.
      * @return error stanza
      */
-    protected Stanza executeNonGetIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
+    protected List<Stanza> executeNonGetIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
             SessionContext sessionContext) {
         throw new RuntimeException("iq stanza type not supported: " + stanza.getIQType().value());
     }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java
index 0ad8b59..2bb3d11 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java
@@ -31,6 +31,9 @@ import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 import org.apache.vysper.xmpp.state.resourcebinding.BindException;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * handles bind requests
  *
@@ -45,7 +48,7 @@ public class BindIQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
 
         // As per RFC3920.7, the client may propose a resource id to the server:
         //
@@ -71,15 +74,15 @@ public class BindIQHandler extends DefaultIQHandler {
                         NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND).addText(entity.getFullQualifiedName())
                 .endInnerElement().endInnerElement();
 
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
 
-    private Stanza bindError(IQStanza stanza, SessionContext sessionContext) {
+    private List<Stanza> bindError(IQStanza stanza, SessionContext sessionContext) {
         StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.ERROR, stanza.getID())
                 .startInnerElement("error", NamespaceURIs.JABBER_CLIENT).addAttribute("type", "cancel")
                 .startInnerElement("not-allowed", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS).endInnerElement();
 
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
 
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java
index 155450f..b0039b7 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java
@@ -30,6 +30,9 @@ import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
 import org.apache.vysper.xmpp.stanza.StanzaErrorType;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * handles jabber:iq:auth request - by returning "service unavailable"
  *
@@ -44,8 +47,8 @@ public class AuthCompatibilityIQHandler extends IQHandler {
     }
 
     @Override
-    protected Stanza executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
-            SessionContext sessionContext) {
+    protected List<Stanza> executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
+                                          SessionContext sessionContext) {
 
         // from XEP 78 - http://www.xmpp.org/extensions/xep-0078.html:
         // If the server does not support non-SASL authentication (e.g., because it supports only SASL authentication
@@ -57,8 +60,8 @@ public class AuthCompatibilityIQHandler extends IQHandler {
 
         case GET:
         case SET:
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, stanza,
-                    StanzaErrorType.CANCEL, "jabber:iq:auth not supported", "en", null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, stanza,
+                    StanzaErrorType.CANCEL, "jabber:iq:auth not supported", "en", null));
 
         case RESULT:
         case ERROR:
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java
index 98d7aa3..83147ea 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java
@@ -30,6 +30,9 @@ import org.apache.vysper.xmpp.stanza.PresenceStanza;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * handling presence stanzas
  *
@@ -51,8 +54,8 @@ public class PresenceHandler extends XMPPCoreStanzaHandler {
     }
 
     @Override
-    protected Stanza executeCore(XMPPCoreStanza stanza, ServerRuntimeContext serverRuntimeContext,
-            boolean isOutboundStanza, SessionContext sessionContext) {
+    protected List<Stanza> executeCore(XMPPCoreStanza stanza, ServerRuntimeContext serverRuntimeContext,
+                                       boolean isOutboundStanza, SessionContext sessionContext) {
         PresenceStanza presenceStanza = (PresenceStanza) stanza;
 
         boolean subscriptionRelated = isSubscriptionType(presenceStanza.getPresenceType());
@@ -60,11 +63,11 @@ public class PresenceHandler extends XMPPCoreStanzaHandler {
         RosterManager rosterManager = RosterManagerUtils.getRosterInstance(serverRuntimeContext, sessionContext);
 
         if (!subscriptionRelated)
-            return AVAILABILITY_HANDLER.executeCorePresence(serverRuntimeContext, isOutboundStanza, sessionContext,
-                    presenceStanza, rosterManager);
+            return Collections.singletonList(AVAILABILITY_HANDLER.executeCorePresence(serverRuntimeContext, isOutboundStanza, sessionContext,
+                    presenceStanza, rosterManager));
         else
-            return SUBSCRIPTION_HANDLER.executeCorePresence(serverRuntimeContext, isOutboundStanza, sessionContext,
-                    presenceStanza, rosterManager);
+            return Collections.singletonList(SUBSCRIPTION_HANDLER.executeCorePresence(serverRuntimeContext, isOutboundStanza, sessionContext,
+                    presenceStanza, rosterManager));
     }
 
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
index 08cc0dd..84e7310 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
@@ -28,6 +28,9 @@ import org.apache.vysper.xmpp.stanza.IQStanzaType;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * handles session requests
  *
@@ -41,8 +44,8 @@ public class SessionIQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
-        return StanzaBuilder.createIQStanza(null, null, IQStanzaType.RESULT, stanza.getID()).addAttribute("from",
-                sessionContext.getServerJID().getFullQualifiedName()).build();
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+        return Collections.singletonList(StanzaBuilder.createIQStanza(null, null, IQStanzaType.RESULT, stanza.getID()).addAttribute("from",
+                sessionContext.getServerJID().getFullQualifiedName()).build());
     }
 }
\ No newline at end of file
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandler.java
index c930209..605cf5e 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandler.java
@@ -37,6 +37,9 @@ import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
 import org.apache.vysper.xmpp.stanza.StanzaErrorType;
 import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @author The Apache MINA Project (dev@mina.apache.org)
  */
@@ -55,7 +58,7 @@ public class PrivateDataIQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         // Get From
         Entity to = stanza.getTo();
         Entity from = stanza.getFrom();
@@ -65,8 +68,8 @@ public class PrivateDataIQHandler extends DefaultIQHandler {
 
         // Not null, and not addressed to itself
         if (to != null && !to.getBareJID().equals(sessionContext.getInitiatingEntity().getBareJID())) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza,
-                    StanzaErrorType.CANCEL, 403, "Private data only modifiable by the owner", null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza,
+                    StanzaErrorType.CANCEL, 403, "Private data only modifiable by the owner", null, null));
         }
 
         XMLElement queryElement = stanza.getFirstInnerElement();
@@ -74,16 +77,16 @@ public class PrivateDataIQHandler extends DefaultIQHandler {
         // Example 4: http://xmpp.org/extensions/xep-0049.html
         // Query element must have a child element with a non-null namespace
         if (queryElement.getInnerElements().size() != 1) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
-                    StanzaErrorType.MODIFY, "query's child element is missing", null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
+                    StanzaErrorType.MODIFY, "query's child element is missing", null, null));
         }
         XMLElement x = queryElement.getFirstInnerElement();
         String ns = x.getNamespaceURI();
 
         // No persistance Manager
         if (persistenceManager == null) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
-                    stanza, StanzaErrorType.WAIT, "internal storage inaccessible", null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
+                    stanza, StanzaErrorType.WAIT, "internal storage inaccessible", null, null));
         }
 
         String queryKey = getKey(x);
@@ -91,14 +94,14 @@ public class PrivateDataIQHandler extends DefaultIQHandler {
         boolean success = persistenceManager.setPrivateData(from, queryKey, queryContent);
 
         if (success) {
-            return StanzaBuilder.createIQStanza(null, from, IQStanzaType.RESULT, stanza.getID()).build();
+            return Collections.singletonList(StanzaBuilder.createIQStanza(null, from, IQStanzaType.RESULT, stanza.getID()).build());
         } else {
-            return StanzaBuilder.createIQStanza(null, from, IQStanzaType.ERROR, stanza.getID()).build();
+            return Collections.singletonList(StanzaBuilder.createIQStanza(null, from, IQStanzaType.ERROR, stanza.getID()).build());
         }
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity to = stanza.getTo();
         Entity from = stanza.getFrom();
         if (from == null) {
@@ -107,15 +110,15 @@ public class PrivateDataIQHandler extends DefaultIQHandler {
 
         // Not null, and not addressed to itself
         if (to != null && !to.getBareJID().equals(sessionContext.getInitiatingEntity().getBareJID())) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza,
-                    StanzaErrorType.CANCEL, 403, "can only view your data", null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza,
+                    StanzaErrorType.CANCEL, 403, "can only view your data", null, null));
         }
 
         XMLElement queryElement = stanza.getFirstInnerElement();
         XMLElement x = queryElement.getFirstInnerElement();
         if (x == null) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
-                    StanzaErrorType.MODIFY, "query's child element missing", null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
+                    StanzaErrorType.MODIFY, "query's child element missing", null, null));
         }
 
         // No persistancy Manager
@@ -140,12 +143,12 @@ public class PrivateDataIQHandler extends DefaultIQHandler {
         } else {
             stanzaBuilder.addPreparedElement(x);
         }
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
     
-    private Stanza buildInteralStorageError(XMPPCoreStanza stanza) {
-        return ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
-                stanza, StanzaErrorType.WAIT, "internal storage inaccessible", null, null);
+    private List<Stanza> buildInteralStorageError(XMPPCoreStanza stanza) {
+        return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
+                stanza, StanzaErrorType.WAIT, "internal storage inaccessible", null, null));
     }
 
     
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandIQHandler.java
index 7cba5ec..d4a0a1c 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandIQHandler.java
@@ -21,6 +21,7 @@ package org.apache.vysper.xmpp.modules.extension.xep0050_adhoc_commands;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -63,7 +64,7 @@ public class AdhocCommandIQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity from = stanza.getFrom();
         if (from == null) {
             from = sessionContext.getInitiatingEntity();
@@ -77,8 +78,8 @@ public class AdhocCommandIQHandler extends DefaultIQHandler {
         try {
             XMLElement commandElement = stanza.getSingleInnerElementsNamed("command");
             if (commandElement == null) {
-                return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
-                        StanzaErrorType.MODIFY, "command is missing", null, null);
+                return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+                        StanzaErrorType.MODIFY, "command is missing", null, null));
             }
             commandNode = commandElement.getAttributeValue("node");
             requestedSessionId = commandElement.getAttributeValue("sessionid");
@@ -95,14 +96,14 @@ public class AdhocCommandIQHandler extends DefaultIQHandler {
             } else {
                 commandHandler = runningCommands.get(requestedSessionId);
                 if (commandHandler == null) {
-                    return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
-                            StanzaErrorType.CANCEL, "command session id not found: " + requestedSessionId, null, null);
+                    return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+                            StanzaErrorType.CANCEL, "command session id not found: " + requestedSessionId, null, null));
                 }
             }
             commandElements = commandElement.getInnerElements();
         } catch (XMLSemanticError xmlSemanticError) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
-                    StanzaErrorType.MODIFY, "command is not well-formed", null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+                    StanzaErrorType.MODIFY, "command is not well-formed", null, null));
         }
 
         if ("cancel".equals(action)) {
@@ -112,8 +113,8 @@ public class AdhocCommandIQHandler extends DefaultIQHandler {
 
         // handle unauthorized access (or command does not exist at all)
         if (commandHandler == null) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza,
-                    StanzaErrorType.CANCEL, "command is not available", null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza,
+                    StanzaErrorType.CANCEL, "command is not available", null, null));
         }
 
         List<Note> notes = new ArrayList<Note>();
@@ -122,18 +123,17 @@ public class AdhocCommandIQHandler extends DefaultIQHandler {
         final String sessionId = commandHandler.getSessionId();
         final boolean isExecuting = commandHandler.isExecuting();
 
-        final Stanza response = buildResponse(stanza, from, commandNode, sessionId, 
+        return buildResponse(stanza, from, commandNode, sessionId, 
                                              isExecuting ? "executing" : "completed", result, notes,
                                               commandHandler.isPrevAllowed(), commandHandler.isNextAllowed());
-        return response;
     }
 
-    private Stanza buildResponse(IQStanza stanza, Entity from, String commandNode, String sessionId, 
+    private List<Stanza> buildResponse(IQStanza stanza, Entity from, String commandNode, String sessionId, 
                                  final String status) {
         return buildResponse(stanza, from, commandNode, sessionId, status, null, null, false, false);
     }
     
-    private Stanza buildResponse(IQStanza stanza, Entity from, String commandNode, String sessionId,
+    private List<Stanza> buildResponse(IQStanza stanza, Entity from, String commandNode, String sessionId,
                                  final String status, XMLElement result,
                                  List<Note> notes, boolean isPrevAllowed, boolean isNextAllowed) {
         final StanzaBuilder iqStanza = StanzaBuilder.createIQStanza(null, from, IQStanzaType.RESULT, stanza.getID());
@@ -161,7 +161,7 @@ public class AdhocCommandIQHandler extends DefaultIQHandler {
         }
         iqStanza.endInnerElement();
 
-        return iqStanza.build();
+        return Collections.singletonList(iqStanza.build());
     }
 /*
 <iq from='shakespeare.lit'
@@ -207,7 +207,7 @@ public class AdhocCommandIQHandler extends DefaultIQHandler {
     
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
 
         Entity to = stanza.getTo();
         Entity from = stanza.getFrom();
@@ -218,6 +218,6 @@ public class AdhocCommandIQHandler extends DefaultIQHandler {
 
         StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(stanza.getTo(), stanza.getFrom(),
                 IQStanzaType.RESULT, stanza.getID());
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
 }
\ No newline at end of file
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java
index f447a3a..f895cb5 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java
@@ -38,6 +38,9 @@ import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
 import org.apache.vysper.xmpp.stanza.StanzaErrorType;
 import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  *
  * @author The Apache MINA Project (dev@mina.apache.org)
@@ -59,7 +62,7 @@ public class VcardTempIQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity to = stanza.getTo();
         Entity from = stanza.getFrom();
         if (from == null) {
@@ -68,20 +71,20 @@ public class VcardTempIQHandler extends DefaultIQHandler {
 
         // Not null, and not addressed to itself
         if (to != null && !to.getBareJID().equals(sessionContext.getInitiatingEntity().getBareJID())) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza,
-                    StanzaErrorType.AUTH, "VCard only modifiable by the owner", null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza,
+                    StanzaErrorType.AUTH, "VCard only modifiable by the owner", null, null));
         }
         
         XMLElement vCardElement = null;
         try {
             vCardElement = stanza.getSingleInnerElementsNamed("vCard");
         } catch (XMLSemanticError xmlSemanticError) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
-                    StanzaErrorType.MODIFY, "vCard element is missing", null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+                    StanzaErrorType.MODIFY, "vCard element is missing", null, null));
         }
         if(vCardElement == null) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
-                    StanzaErrorType.MODIFY, "vCard element is missing", null, null);            
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+                    StanzaErrorType.MODIFY, "vCard element is missing", null, null));            
         }
         
         String vcardContent = new Renderer(vCardElement).getComplete();
@@ -93,14 +96,14 @@ public class VcardTempIQHandler extends DefaultIQHandler {
         boolean success = persistenceManager.setVcard(from, vcardContent);
 
         if (success) {
-            return StanzaBuilder.createIQStanza(null, from, IQStanzaType.RESULT, stanza.getID()).build();
+            return Collections.singletonList(StanzaBuilder.createIQStanza(null, from, IQStanzaType.RESULT, stanza.getID()).build());
         } else {
-            return StanzaBuilder.createIQStanza(null, from, IQStanzaType.ERROR, stanza.getID()).build();
+            return Collections.singletonList(StanzaBuilder.createIQStanza(null, from, IQStanzaType.ERROR, stanza.getID()).build());
         }
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
 
         Entity to = stanza.getTo();
         Entity from = stanza.getFrom();
@@ -131,7 +134,7 @@ public class VcardTempIQHandler extends DefaultIQHandler {
                         .startInnerElement("item-not-found", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS)
                         .endInnerElement().endInnerElement();
             }
-            return stanzaBuilder.build();
+            return Collections.singletonList(stanzaBuilder.build());
         }
 
         StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(stanza.getTo(), stanza.getFrom(),
@@ -142,12 +145,12 @@ public class VcardTempIQHandler extends DefaultIQHandler {
         } catch (Exception e) {
             return buildInteralStorageError(stanza);
         }
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
     
-    private Stanza buildInteralStorageError(XMPPCoreStanza stanza) {
-        return ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
-                stanza, StanzaErrorType.WAIT, "internal storage inaccessible", null, null);
+    private List<Stanza> buildInteralStorageError(XMPPCoreStanza stanza) {
+        return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
+                stanza, StanzaErrorType.WAIT, "internal storage inaccessible", null, null));
     }
 
 }
\ No newline at end of file
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0077_inbandreg/InBandRegistrationHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0077_inbandreg/InBandRegistrationHandler.java
index 189f260..0987bb9 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0077_inbandreg/InBandRegistrationHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0077_inbandreg/InBandRegistrationHandler.java
@@ -41,6 +41,9 @@ import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
 import org.apache.vysper.xmpp.stanza.StanzaErrorType;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Implementation of <a href="http://xmpp.org/extensions/xep-0077.html">XEP-0077 In-Band Registration</a>.
  *  
@@ -63,19 +66,7 @@ public class InBandRegistrationHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
-        //        <iq type='result' id='reg1'>
-        //        <query xmlns='jabber:iq:register'>
-        //          <instructions>
-        //            Choose a username and password for use with this service.
-        //            Please also provide your email address.
-        //          </instructions>
-        //          <username/>
-        //          <password/>
-        //          <email/>
-        //        </query>
-        //      </iq>
-
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         if(sessionContext.getState().equals(SessionState.STARTED)
                 || sessionContext.getState().equals(SessionState.ENCRYPTED) 
                 || sessionContext.getState().equals(SessionState.AUTHENTICATED)) {
@@ -94,14 +85,14 @@ public class InBandRegistrationHandler extends DefaultIQHandler {
                     stanzaBuilder.startInnerElement("username", NamespaceURIs.JABBER_IQ_REGISTER).endInnerElement()
                         .startInnerElement("password", NamespaceURIs.JABBER_IQ_REGISTER).endInnerElement();
                 }
-                return stanzaBuilder.build();
+                return Collections.singletonList(stanzaBuilder.build());
         } else {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, stanza, StanzaErrorType.CANCEL, null, null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, stanza, StanzaErrorType.CANCEL, null, null, null));
         }
     }
     
     @Override
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         //        <iq type='set' id='reg2'>
         //        <query xmlns='jabber:iq:register'>
         //          <username>bill</username>
@@ -151,26 +142,17 @@ public class InBandRegistrationHandler extends DefaultIQHandler {
                         accountManagement.addUser(user, password);
                     }
                 }
-                return StanzaBuilder.createDirectReply(stanza, true, IQStanzaType.RESULT).build();
+                return Collections.singletonList(StanzaBuilder.createDirectReply(stanza, true, IQStanzaType.RESULT).build());
                 
             } catch (XMLSemanticError e) {
-                //        <iq type='error' id='reg2'>
-                //            <query xmlns='jabber:iq:register'>
-                //              <username>bill</username>
-                //              <password>Calliope</password>
-                //            </query>
-                //            <error code='406' type='modify'>
-                //              <not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
-                //            </error>
-                //          </iq>
-                return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza, StanzaErrorType.MODIFY, 406, null, null, null);
+                return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza, StanzaErrorType.MODIFY, 406, null, null, null));
             } catch (EntityFormatException e) {
-                return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza, StanzaErrorType.MODIFY, 406, null, null, null);
+                return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza, StanzaErrorType.MODIFY, 406, null, null, null));
             } catch (AccountCreationException e) {
-                return ServerErrorResponses.getStanzaError(StanzaErrorCondition.CONFLICT, stanza, StanzaErrorType.CANCEL, 409, e.getMessage(), null, null);
+                return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.CONFLICT, stanza, StanzaErrorType.CANCEL, 409, e.getMessage(), null, null));
             }
         } else {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, stanza, StanzaErrorType.CANCEL, null, null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, stanza, StanzaErrorType.CANCEL, null, null, null));
         }
     }
   
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java
index 2ba1471..1a1b4b8 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java
@@ -30,6 +30,9 @@ import org.apache.vysper.xmpp.stanza.IQStanzaType;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  *
  * @author The Apache MINA Project (dev@mina.apache.org)
@@ -48,7 +51,7 @@ public class SoftwareVersionIQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
 
         StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(stanza.getTo(), stanza.getFrom(),
                 IQStanzaType.RESULT, stanza.getID()).startInnerElement("query", NamespaceURIs.JABBER_IQ_VERSION).
@@ -60,6 +63,6 @@ public class SoftwareVersionIQHandler extends DefaultIQHandler {
 
                 endInnerElement();
 
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandler.java
index 655bace..bee62a5 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandler.java
@@ -20,6 +20,7 @@
 package org.apache.vysper.xmpp.modules.extension.xep0199_xmppping;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.compliance.SpecCompliant;
@@ -94,16 +95,16 @@ public class XmppPingIQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
 
         StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(stanza.getTo(), stanza.getFrom(),
                 IQStanzaType.RESULT, stanza.getID());
 
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
     
     @Override
-    protected Stanza handleResult(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
+    protected List<Stanza> handleResult(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
             SessionContext sessionContext) {
         List<XmppPinger> pingersCopy = new ArrayList<XmppPinger>(pingers);
         for (XmppPinger pinger : pingersCopy) {
@@ -115,7 +116,7 @@ public class XmppPingIQHandler extends DefaultIQHandler {
             }
         }
 
-        return null;
+        return Collections.emptyList();
     }
     
     
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java
index 189ac7a..e58f1e3 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java
@@ -20,7 +20,9 @@
 package org.apache.vysper.xmpp.modules.extension.xep0202_entity_time;
 
 import java.text.SimpleDateFormat;
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 
 import org.apache.vysper.compliance.SpecCompliant;
 import org.apache.vysper.xmpp.datetime.DateTimeProfile;
@@ -49,7 +51,7 @@ public class EntityTimeIQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
 
         Date now = new Date();
 
@@ -66,6 +68,6 @@ public class EntityTimeIQHandler extends DefaultIQHandler {
 
         endInnerElement();
 
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java
index 13aa1bb..37dcbbd 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java
@@ -20,7 +20,9 @@
 package org.apache.vysper.xmpp.modules.extension.xep0202_entity_time;
 
 import java.text.SimpleDateFormat;
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -61,7 +63,7 @@ public class EntityTimeXEP0090IQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
 
         Date now = new Date();
 
@@ -79,6 +81,6 @@ public class EntityTimeXEP0090IQHandler extends DefaultIQHandler {
 
         endInnerElement();
 
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
index d6ade9d..a1b8610 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
@@ -26,6 +26,7 @@ import static org.apache.vysper.compliance.SpecCompliant.ComplianceStatus.IN_PRO
 import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.NONE;
 import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.REMOVE;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.compliance.SpecCompliance;
@@ -85,7 +86,7 @@ public class RosterIQHandler extends DefaultIQHandler {
             @SpecCompliant(spec = "rfc3921bis-08", section = "2.1.5", status = FINISHED, coverage = PARTIAL),
             @SpecCompliant(spec = "rfc3921bis-08", section = "2.2", status = FINISHED, coverage = COMPLETE) })
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
 
         ResourceRegistry registry = serverRuntimeContext.getResourceRegistry();
         RosterManager rosterManager = (RosterManager) serverRuntimeContext.getStorageProvider(RosterManager.class);
@@ -96,10 +97,10 @@ public class RosterIQHandler extends DefaultIQHandler {
 
         Entity from = extractUniqueSenderJID(stanza, sessionContext);
         if (from == null || !from.isResourceSet()) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER, stanza,
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER, stanza,
                     StanzaErrorType.MODIFY,
                     "sender info insufficient: " + ((from == null) ? "no from" : from.getFullQualifiedName()), null,
-                    null);
+                    null));
         }
         String resourceId = from.getResource();
 
@@ -120,7 +121,7 @@ public class RosterIQHandler extends DefaultIQHandler {
         // from becomes to
         StanzaBuilder stanzaBuilder = RosterStanzaUtils.createRosterItemsIQ(from, stanza.getID(), IQStanzaType.RESULT,
                 roster);
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
 
     @SpecCompliance(compliant = {
@@ -129,7 +130,7 @@ public class RosterIQHandler extends DefaultIQHandler {
             @SpecCompliant(spec = "rfc3921bis-08", section = "2.1.6", status = FINISHED, coverage = PARTIAL, comment = "only set-related content applies"),
             @SpecCompliant(spec = "rfc3921bis-08", section = "2.5", status = FINISHED, coverage = COMPLETE, comment = "only calling from here") })
     @Override
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         RosterManager rosterManager = (RosterManager) serverRuntimeContext.getStorageProvider(RosterManager.class);
 
         if (rosterManager == null) {
@@ -138,21 +139,21 @@ public class RosterIQHandler extends DefaultIQHandler {
 
         Entity user = extractUniqueSenderJID(stanza, sessionContext);
         if (user == null || !user.isResourceSet()) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER, stanza,
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER, stanza,
                     StanzaErrorType.MODIFY,
                     "sender info insufficient: " + ((user == null) ? "no from" : user.getFullQualifiedName()), null,
-                    null);
+                    null));
         }
 
         RosterItem setRosterItem;
         try {
             setRosterItem = RosterUtils.parseRosterItem(stanza);
         } catch (RosterBadRequestException e) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
-                    StanzaErrorType.MODIFY, e.getMessage(), null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+                    StanzaErrorType.MODIFY, e.getMessage(), null, null));
         } catch (RosterNotAcceptableException e) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
-                    StanzaErrorType.MODIFY, e.getMessage(), null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
+                    StanzaErrorType.MODIFY, e.getMessage(), null, null));
         }
 
         Entity contactJid = setRosterItem.getJid().getBareJID();
@@ -185,17 +186,17 @@ public class RosterIQHandler extends DefaultIQHandler {
             // update contact persistently
             rosterManager.addContact(user.getBareJID(), existingItem);
         } catch (RosterException e) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
-                    StanzaErrorType.CANCEL, "roster item contact not (yet) in roster: " + contactJid, null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+                    StanzaErrorType.CANCEL, "roster item contact not (yet) in roster: " + contactJid, null, null));
         }
 
         pushRosterItemToInterestedResources(sessionContext, user, existingItem);
 
-        return RosterStanzaUtils.createRosterItemIQ(user, stanza.getID(), IQStanzaType.RESULT, existingItem);
+        return Collections.singletonList(RosterStanzaUtils.createRosterItemIQ(user, stanza.getID(), IQStanzaType.RESULT, existingItem));
     }
 
     @SpecCompliant(spec = "rfc3921bis-08", section = "2.5", status = IN_PROGRESS, coverage = COMPLETE, comment = "actual implementation")
-    private Stanza rosterItemRemove(IQStanza stanza, SessionContext sessionContext, RosterManager rosterManager,
+    private List<Stanza> rosterItemRemove(IQStanza stanza, SessionContext sessionContext, RosterManager rosterManager,
             Entity user, Entity contactJid, RosterItem existingItem) {
         // rfc3921bis-08/2.5
         Stanza unsubscribedStanza = null;
@@ -215,8 +216,8 @@ public class RosterIQHandler extends DefaultIQHandler {
         try {
             rosterManager.removeContact(user.getBareJID(), contactJid);
         } catch (RosterException e) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
-                    StanzaErrorType.CANCEL, "roster item contact not in roster: " + contactJid, null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
+                    StanzaErrorType.CANCEL, "roster item contact not in roster: " + contactJid, null, null));
         }
 
         if (unsubscribedStanza != null) {
@@ -240,7 +241,7 @@ public class RosterIQHandler extends DefaultIQHandler {
         pushRosterItemToInterestedResources(sessionContext, user, new RosterItem(contactJid, REMOVE));
 
         // return success
-        return StanzaBuilder.createIQStanza(null, user, IQStanzaType.RESULT, stanza.getID()).build();
+        return Collections.singletonList(StanzaBuilder.createIQStanza(null, user, IQStanzaType.RESULT, stanza.getID()).build());
     }
 
     private void pushRosterItemToInterestedResources(SessionContext sessionContext, Entity user, RosterItem rosterItem) {
@@ -254,7 +255,7 @@ public class RosterIQHandler extends DefaultIQHandler {
         }
     }
 
-    protected Stanza handleCannotRetrieveRoster(IQStanza stanza, SessionContext sessionContext) {
+    protected List<Stanza> handleCannotRetrieveRoster(IQStanza stanza, SessionContext sessionContext) {
         throw new RuntimeException("gracefully handling roster management problem not implemented");
     }
 
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
index 1277bb9..5d8942f 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
@@ -19,6 +19,7 @@
  */
 package org.apache.vysper.xmpp.modules.servicediscovery.handler;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.compliance.SpecCompliance;
@@ -65,7 +66,7 @@ public class DiscoInfoIQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         ServiceCollector serviceCollector = null;
 
         // TODO if the target entity does not exist, return error/cancel/item-not-found
@@ -81,9 +82,9 @@ public class DiscoInfoIQHandler extends DefaultIQHandler {
         }
 
         if (serviceCollector == null) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR, stanza,
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR, stanza,
                     StanzaErrorType.CANCEL, "cannot retrieve IQ-get-info result from internal components",
-                    getErrorLanguage(serverRuntimeContext, sessionContext), null);
+                    getErrorLanguage(serverRuntimeContext, sessionContext), null));
         }
 
         // if "vysper.org" is the server entity, 'to' can either be "vysper.org", "node@vysper.org", "service.vysper.org".
@@ -98,10 +99,10 @@ public class DiscoInfoIQHandler extends DefaultIQHandler {
         } else if (!to.isNodeSet()) {
             isServerInfoRequest = serverEntity.equals(to);
             if (!isServerInfoRequest) {
-                return ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
+                return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
                         StanzaErrorType.CANCEL,
                         "server does not handle info query requests for " + to.getFullQualifiedName(),
-                        getErrorLanguage(serverRuntimeContext, sessionContext), null);
+                        getErrorLanguage(serverRuntimeContext, sessionContext), null));
             }
         }
 
@@ -134,8 +135,8 @@ public class DiscoInfoIQHandler extends DefaultIQHandler {
             StanzaErrorCondition stanzaErrorCondition = e.getErrorCondition();
             if (stanzaErrorCondition == null)
                 stanzaErrorCondition = StanzaErrorCondition.INTERNAL_SERVER_ERROR;
-            return ServerErrorResponses.getStanzaError(stanzaErrorCondition, stanza, StanzaErrorType.CANCEL,
-                    "disco info request failed.", getErrorLanguage(serverRuntimeContext, sessionContext), null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(stanzaErrorCondition, stanza, StanzaErrorType.CANCEL,
+                    "disco info request failed.", getErrorLanguage(serverRuntimeContext, sessionContext), null));
         }
 
         //TODO check that elementSet contains at least one identity element and on feature element!
@@ -152,11 +153,11 @@ public class DiscoInfoIQHandler extends DefaultIQHandler {
 
         stanzaBuilder.endInnerElement();
 
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
 
     @Override
-    protected Stanza handleResult(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
+    protected List<Stanza> handleResult(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
             SessionContext sessionContext) {
 
         if (stanza.getTo().isNodeSet()) {
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
index 8ebf796..9763eb0 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
@@ -19,6 +19,7 @@
  */
 package org.apache.vysper.xmpp.modules.servicediscovery.handler;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.compliance.SpecCompliant;
@@ -64,7 +65,7 @@ public class DiscoItemIQHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         ServiceCollector serviceCollector = null;
 
         // retrieve the service collector
@@ -77,9 +78,9 @@ public class DiscoItemIQHandler extends DefaultIQHandler {
         }
 
         if (serviceCollector == null) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
                     stanza, StanzaErrorType.CANCEL, "cannot retrieve IQ-get-items result from internal components",
-                    getErrorLanguage(serverRuntimeContext, sessionContext), null);
+                    getErrorLanguage(serverRuntimeContext, sessionContext), null));
         }
 
         Entity to = stanza.getTo();
@@ -91,10 +92,10 @@ public class DiscoItemIQHandler extends DefaultIQHandler {
             isServerInfoRequest = serverRuntimeContext.getServerEnitity().equals(to);
             isComponentInfoRequest = serverRuntimeContext.getComponentStanzaProcessor(to) != null;
             if (!isServerInfoRequest && !isComponentInfoRequest) {
-                return ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
+                return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
                         StanzaErrorType.CANCEL,
                         "server does not handle items query requests for " + to.getFullQualifiedName(),
-                        getErrorLanguage(serverRuntimeContext, sessionContext), null);
+                        getErrorLanguage(serverRuntimeContext, sessionContext), null));
             }
         }
 
@@ -113,9 +114,9 @@ public class DiscoItemIQHandler extends DefaultIQHandler {
             StanzaErrorCondition stanzaErrorCondition = e.getErrorCondition();
             if (stanzaErrorCondition == null)
                 stanzaErrorCondition = StanzaErrorCondition.INTERNAL_SERVER_ERROR;
-            return ServerErrorResponses.getStanzaError(stanzaErrorCondition, stanza,
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(stanzaErrorCondition, stanza,
                     StanzaErrorType.CANCEL, "disco info request failed.",
-                    getErrorLanguage(serverRuntimeContext, sessionContext), null);
+                    getErrorLanguage(serverRuntimeContext, sessionContext), null));
         }
 
         // render the stanza with information collected
@@ -129,6 +130,6 @@ public class DiscoItemIQHandler extends DefaultIQHandler {
         }
         stanzaBuilder.endInnerElement();
 
-        return stanzaBuilder.build();
+        return Collections.singletonList(stanzaBuilder.build());
     }
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseStanzaContainer.java b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseStanzaContainer.java
index 7ffa02b..234ed39 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseStanzaContainer.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseStanzaContainer.java
@@ -19,6 +19,8 @@
  */
 package org.apache.vysper.xmpp.protocol;
 
+import java.util.List;
+
 import org.apache.vysper.xmpp.stanza.Stanza;
 
 /**
@@ -27,7 +29,15 @@ import org.apache.vysper.xmpp.stanza.Stanza;
  * @author The Apache MINA Project (dev@mina.apache.org)
  */
 public interface ResponseStanzaContainer {
-    Stanza getResponseStanza();
+
+    List<Stanza> getResponseStanzas();
+
+    /**
+     * @return If there is exactly one response, the unique response. If there is no
+     *         response it will return null. If there is more than one response, it
+     *         will throw an exception.
+     */
+    Stanza getUniqueResponseStanza();
 
     boolean hasResponse();
 
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseStanzaContainerImpl.java b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseStanzaContainerImpl.java
index 104b400..1fdad72 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseStanzaContainerImpl.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseStanzaContainerImpl.java
@@ -19,6 +19,14 @@
  */
 package org.apache.vysper.xmpp.protocol;
 
+import static java.util.Optional.ofNullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 import org.apache.vysper.xmpp.stanza.Stanza;
 
 /**
@@ -26,18 +34,32 @@ import org.apache.vysper.xmpp.stanza.Stanza;
  * @author The Apache MINA Project (dev@mina.apache.org)
  */
 public class ResponseStanzaContainerImpl implements ResponseStanzaContainer {
-    private Stanza response;
+    private final List<Stanza> responses;
 
     public ResponseStanzaContainerImpl(Stanza stanza) {
-        this.response = stanza;
+        this(Collections.singletonList(stanza));
+    }
+
+    public ResponseStanzaContainerImpl(List<Stanza> stanzas) {
+        this.responses = ofNullable(stanzas).orElse(Collections.emptyList()).stream().filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<Stanza> getResponseStanzas() {
+        return new ArrayList<>(responses);
     }
 
-    public Stanza getResponseStanza() {
-        return response;
+    @Override
+    public Stanza getUniqueResponseStanza() {
+        if (responses.size() > 1) {
+            throw new IllegalStateException("Found more than one response");
+        }
+        return responses.stream().findFirst().orElse(null);
     }
 
     public boolean hasResponse() {
-        return response != null;
+        return !responses.isEmpty();
     }
 
     public boolean hasNoResponse() {
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseWriter.java b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseWriter.java
index 893f255..408c80d 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseWriter.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseWriter.java
@@ -54,8 +54,8 @@ public class ResponseWriter {
      * @param responseStanzaContainer
      */
     public static void writeResponse(SessionContext sessionContext, ResponseStanzaContainer responseStanzaContainer) {
-        Stanza responseStanza = responseStanzaContainer.getResponseStanza();
-        writeResponse(sessionContext, responseStanza);
+        responseStanzaContainer.getResponseStanzas()
+                .forEach(stanza -> writeResponse(sessionContext, stanza));
     }
 
     /**
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/worker/AbstractStateAwareProtocolWorker.java b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/worker/AbstractStateAwareProtocolWorker.java
index 00f0c0c..f9e6e8b 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/worker/AbstractStateAwareProtocolWorker.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/worker/AbstractStateAwareProtocolWorker.java
@@ -57,13 +57,14 @@ public abstract class AbstractStateAwareProtocolWorker implements StateAwareProt
     }
 
     protected void writeResponse(SessionContext sessionContext, ResponseStanzaContainer responseStanzaContainer) {
-        if (responseStanzaContainer != null && responseStanzaContainer.getResponseStanza() != null) {
-            if (sessionContext == null) {
-                throw new IllegalStateException("no session context to write stanza to: "
-                        + responseStanzaContainer.getResponseStanza());
-            }
-            ResponseWriter.writeResponse(sessionContext, responseStanzaContainer);
+        if (responseStanzaContainer == null) {
+            return;
         }
+        if (sessionContext == null) {
+            throw new IllegalStateException("no session context to write stanza to: "
+                    + responseStanzaContainer.getResponseStanzas());
+        }
+        ResponseWriter.writeResponse(sessionContext, responseStanzaContainer);
     }
 
     protected ResponseStanzaContainer executeHandler(SessionContext sessionContext,
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/worker/InboundStanzaProtocolWorker.java b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/worker/InboundStanzaProtocolWorker.java
index d3dd63b..0a11ede 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/worker/InboundStanzaProtocolWorker.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/worker/InboundStanzaProtocolWorker.java
@@ -20,6 +20,7 @@
 package org.apache.vysper.xmpp.protocol.worker;
 
 import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
+import org.apache.vysper.xmpp.protocol.ResponseWriter;
 import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.server.SessionState;
 import org.apache.vysper.xmpp.stanza.Stanza;
@@ -44,12 +45,9 @@ public class InboundStanzaProtocolWorker extends AbstractStateAwareProtocolWorke
 
     @Override
     protected void writeResponse(SessionContext sessionContext, ResponseStanzaContainer responseStanzaContainer) {
-        if (responseStanzaContainer != null && responseStanzaContainer.getResponseStanza() != null) {
-            Stanza responseStanza = responseStanzaContainer.getResponseStanza();
-
-            sessionContext.getResponseWriter().write(responseStanza);
+        if (responseStanzaContainer == null) {
             return;
         }
-        // there was nothing to write
+        ResponseWriter.writeResponse(sessionContext, responseStanzaContainer);
     }
 }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/server/components/ComponentStanzaProcessor.java b/server/core/src/main/java/org/apache/vysper/xmpp/server/components/ComponentStanzaProcessor.java
index af959e6..e67095b 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/server/components/ComponentStanzaProcessor.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/server/components/ComponentStanzaProcessor.java
@@ -32,6 +32,8 @@ import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
 
+import java.util.List;
+
 /**
  */
 public class ComponentStanzaProcessor implements StanzaProcessor {
@@ -76,14 +78,17 @@ public class ComponentStanzaProcessor implements StanzaProcessor {
             e.printStackTrace();
         }
 
-        if (responseStanzaContainer != null && responseStanzaContainer.getResponseStanza() != null) {
-            Stanza responseStanza = responseStanzaContainer.getResponseStanza();
-            try {
-                IgnoreFailureStrategy failureStrategy = IgnoreFailureStrategy.IGNORE_FAILURE_STRATEGY; // TODO call back module
+        if (responseStanzaContainer == null) {
+            return;
+        }
+        List<Stanza> responseStanzas = responseStanzaContainer.getResponseStanzas();
+        try {
+            IgnoreFailureStrategy failureStrategy = IgnoreFailureStrategy.IGNORE_FAILURE_STRATEGY; // TODO call back module
+            for (Stanza responseStanza: responseStanzas) {
                 serverRuntimeContext.getStanzaRelay().relay(responseStanza.getTo(), responseStanza, failureStrategy);
-            } catch (DeliveryException e) {
-                throw new RuntimeException(e);
             }
+        } catch (DeliveryException e) {
+            throw new RuntimeException(e);
         }
 
     }
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnector.java b/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnector.java
index 690e069..20046f8 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnector.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnector.java
@@ -211,7 +211,7 @@ public class DefaultXMPPServerConnector implements XmppPingListener, XMPPServerC
                 return;
             }
             if(container != null && container.hasResponse()) {
-                sessionContext.write(container.getResponseStanza());
+                container.getResponseStanzas().forEach(sessionContext::write);
             }
             
             if(sessionStateHolder.getState() == SessionState.AUTHENTICATED) {
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandlerTestCase.java
index 83a9c18..7803d33 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandlerTestCase.java
@@ -59,7 +59,7 @@ public class IQHandlerTestCase extends TestCase {
         TestIQHandler iqHandler = new TestIQHandler();
         ResponseStanzaContainer responseStanzaContainer = iqHandler.execute(stanzaBuilder.build(), sessionContext
                 .getServerRuntimeContext(), true, sessionContext, null);
-        Stanza responseStanza = responseStanzaContainer.getResponseStanza();
+        Stanza responseStanza = responseStanzaContainer.getUniqueResponseStanza();
         XMLElementVerifier verifier = responseStanza.getVerifier();
         assertTrue("error", verifier.nameEquals("error"));
     }
@@ -78,7 +78,7 @@ public class IQHandlerTestCase extends TestCase {
         IQHandler iqHandler = new IQHandler();
         ResponseStanzaContainer responseStanzaContainer = iqHandler.execute(stanza, sessionContext
                 .getServerRuntimeContext(), true, sessionContext, null);
-        Stanza responseStanza = responseStanzaContainer.getResponseStanza();
+        Stanza responseStanza = responseStanzaContainer.getUniqueResponseStanza();
         XMLElementVerifier verifier = responseStanza.getVerifier();
         assertTrue("error", verifier.nameEquals("error")); // response is _not_ IQ stanza
     }
@@ -87,7 +87,7 @@ public class IQHandlerTestCase extends TestCase {
         TestIQHandler iqHandler = new TestIQHandler();
         ResponseStanzaContainer responseStanzaContainer = iqHandler.execute(stanza, sessionContext
                 .getServerRuntimeContext(), true, sessionContext, null);
-        Stanza responseStanza = responseStanzaContainer.getResponseStanza();
+        Stanza responseStanza = responseStanzaContainer.getUniqueResponseStanza();
         XMLElementVerifier verifier = responseStanza.getVerifier();
         assertTrue("iq", verifier.nameEquals("iq"));
         assertTrue("error type", verifier.attributeEquals("type", IQStanzaType.ERROR.value()));
@@ -159,7 +159,7 @@ public class IQHandlerTestCase extends TestCase {
         assertTrue("iq-type-get", verifier.attributeEquals("type", "get"));
 
         // response is "result"
-        Stanza responseStanza = responseStanzaContainer.getResponseStanza();
+        Stanza responseStanza = responseStanzaContainer.getUniqueResponseStanza();
         XMLElementVerifier responseVerifier = responseStanza.getVerifier();
         assertTrue("iq", responseVerifier.nameEquals("iq"));
         assertTrue("iq-id", responseVerifier.attributeEquals("id", "1"));
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandlerTestCase.java
index b8bf83c..f4397a7 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandlerTestCase.java
@@ -39,7 +39,7 @@ public class RelayingIQHandlerTestCase extends PresenceHandlerBaseTestCase {
 
         ResponseStanzaContainer stanzaContainer = relayingIQHandler.execute(iqStanza, sessionContext
                 .getServerRuntimeContext(), true, sessionContext, null /*don't we have as sessionStateHolder?*/);
-        XMPPCoreStanza response = XMPPCoreStanza.getWrapper(stanzaContainer.getResponseStanza());
+        XMPPCoreStanza response = XMPPCoreStanza.getWrapper(stanzaContainer.getUniqueResponseStanza());
         assertNotNull(response);
         assertTrue(response.isError());
     }
@@ -50,7 +50,7 @@ public class RelayingIQHandlerTestCase extends PresenceHandlerBaseTestCase {
 
         ResponseStanzaContainer stanzaContainer = relayingIQHandler.execute(iqStanza, sessionContext
                 .getServerRuntimeContext(), true, sessionContext, null /*don't we have as sessionStateHolder?*/);
-        assertNull(stanzaContainer);
+        assertFalse(stanzaContainer.hasResponse());
         Stanza deliveredStanza = subscribed_FROM.getNextStanza();
         assertTrue(deliveredStanza.getVerifier().onlySubelementEquals("mandatory", NamespaceURIs.JABBER_CLIENT));
         assertEquals(subscribed_FROM.getEntityFQ(), deliveredStanza.getTo());
@@ -62,7 +62,7 @@ public class RelayingIQHandlerTestCase extends PresenceHandlerBaseTestCase {
 
         ResponseStanzaContainer stanzaContainer = relayingIQHandler.execute(iqStanza, sessionContext
                 .getServerRuntimeContext(), false, sessionContext, null /*don't we have as sessionStateHolder?*/);
-        XMPPCoreStanza response = XMPPCoreStanza.getWrapper(stanzaContainer.getResponseStanza());
+        XMPPCoreStanza response = XMPPCoreStanza.getWrapper(stanzaContainer.getUniqueResponseStanza());
         assertNotNull(response);
         assertTrue(response.isError());
     }
@@ -73,7 +73,7 @@ public class RelayingIQHandlerTestCase extends PresenceHandlerBaseTestCase {
 
         ResponseStanzaContainer stanzaContainer = relayingIQHandler.execute(iqStanza, sessionContext
                 .getServerRuntimeContext(), false, sessionContext, null /*don't we have as sessionStateHolder?*/);
-        assertNull(stanzaContainer);
+        assertFalse(stanzaContainer.hasResponse());
         Stanza deliveredStanza = sessionContext.getNextRecordedResponse();
         assertTrue(deliveredStanza.getVerifier().onlySubelementEquals("mandatory", NamespaceURIs.JABBER_CLIENT));
         assertEquals(initiatingUser.getEntityFQ(), deliveredStanza.getTo());
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java
index 5738619..e96e9ba 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java
@@ -28,6 +28,9 @@ import org.apache.vysper.xmpp.stanza.IQStanzaType;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
+import java.util.Collections;
+import java.util.List;
+
 public class TestIQHandler extends IQHandler {
 
     String name = null;
@@ -55,8 +58,8 @@ public class TestIQHandler extends IQHandler {
     }
 
     @Override
-    protected Stanza executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
-            SessionContext sessionContext) {
+    protected List<Stanza> executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
+                                          SessionContext sessionContext) {
         incomingStanza = stanza;
 
         StanzaBuilder responseBuilder = new StanzaBuilder("iq", NamespaceURIs.JABBER_CLIENT, stanza
@@ -66,7 +69,7 @@ public class TestIQHandler extends IQHandler {
 
         responseBuilder.addAttribute("type", IQStanzaType.RESULT.value());
 
-        return responseBuilder.build();
+        return Collections.singletonList(responseBuilder.build());
     }
 
     public IQStanza getIncomingStanza() {
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandlerTestCase.java
index 4a82940..b4c8932 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandlerTestCase.java
@@ -25,6 +25,8 @@ import org.apache.vysper.StanzaAssert;
 import org.apache.vysper.xmpp.addressing.Entity;
 import org.apache.vysper.xmpp.addressing.EntityImpl;
 import org.apache.vysper.xmpp.protocol.NamespaceURIs;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainerImpl;
 import org.apache.vysper.xmpp.server.ServerRuntimeContext;
 import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.stanza.IQStanza;
@@ -36,6 +38,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import java.util.List;
+
 /**
  */
 public class BindIQHandlerTestCase {
@@ -128,30 +132,32 @@ public class BindIQHandlerTestCase {
     public void handleSet() throws BindException {
         Mockito.when(sessionContext.bindResource()).thenReturn("res");
         
-        Stanza response = handler.handleSet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleSet(stanza, serverRuntimeContext, sessionContext);
         
         Stanza expectedResponse = StanzaBuilder.createIQStanza(null, null, IQStanzaType.RESULT, stanza.getID())
             .startInnerElement("bind", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND)
             .startInnerElement("jid",  NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND)
             .addText(new EntityImpl(FROM, "res").getFullQualifiedName())
             .build();
-        
-        StanzaAssert.assertEquals(expectedResponse, response);
+
+        ResponseStanzaContainer responseStanzaContainer = new ResponseStanzaContainerImpl(responses);
+        StanzaAssert.assertEquals(expectedResponse, responseStanzaContainer.getUniqueResponseStanza());
     }
 
     @Test
     public void handleSetWithBindException() throws BindException {
         Mockito.when(sessionContext.bindResource()).thenThrow(new BindException());
-        
-        Stanza response = handler.handleSet(stanza, serverRuntimeContext, sessionContext);
+
+        List<Stanza> responses = handler.handleSet(stanza, serverRuntimeContext, sessionContext);
         
         Stanza expectedResponse = StanzaBuilder.createIQStanza(null, null, IQStanzaType.ERROR, stanza.getID())
             .startInnerElement("error", NamespaceURIs.JABBER_CLIENT)
             .addAttribute("type", "cancel")
             .startInnerElement("not-allowed", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS)
             .build();
-        
-        StanzaAssert.assertEquals(expectedResponse, response);
+
+        ResponseStanzaContainer responseStanzaContainer = new ResponseStanzaContainerImpl(responses);
+        StanzaAssert.assertEquals(expectedResponse, responseStanzaContainer.getUniqueResponseStanza());
     }
 
 }
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandlerTestCase.java
index b20361a..bb73d77 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandlerTestCase.java
@@ -128,12 +128,12 @@ public class AuthCompatibilityIQHandlerTestCase {
     
     @Test
     public void handleResult() throws BindException {
-        Assert.assertNull(handler.execute(stanzaWithResult, serverRuntimeContext, false, sessionContext, sessionStateHolder));
+        Assert.assertFalse(handler.execute(stanzaWithResult, serverRuntimeContext, false, sessionContext, sessionStateHolder).hasResponse());
     }
     
     @Test
     public void handleError() throws BindException {
-        Assert.assertNull(handler.execute(stanzaWithError, serverRuntimeContext, false, sessionContext, sessionStateHolder));
+        Assert.assertFalse(handler.execute(stanzaWithError, serverRuntimeContext, false, sessionContext, sessionStateHolder).hasResponse());
     }
     
     
@@ -151,7 +151,7 @@ public class AuthCompatibilityIQHandlerTestCase {
             .addText("jabber:iq:auth not supported")
             .build();
         
-        StanzaAssert.assertEquals(expectedResponse, response.getResponseStanza());
+        StanzaAssert.assertEquals(expectedResponse, response.getUniqueResponseStanza());
     }
 
 }
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailInitialOutHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailInitialOutHandlerTestCase.java
index a8e314a..9770a6a 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailInitialOutHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailInitialOutHandlerTestCase.java
@@ -25,6 +25,7 @@ import static org.apache.vysper.xmpp.stanza.PresenceStanzaType.PROBE;
 import org.apache.vysper.xml.fragment.XMLSemanticError;
 import org.apache.vysper.xmpp.addressing.EntityFormatException;
 import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainerImpl;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
@@ -32,6 +33,8 @@ import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
 import org.apache.vysper.xmpp.state.resourcebinding.BindException;
 import org.apache.vysper.xmpp.state.resourcebinding.ResourceState;
 
+import java.util.List;
+
 /**
  */
 public class PresenceAvailInitialOutHandlerTestCase extends PresenceHandlerBaseTestCase {
@@ -100,8 +103,9 @@ public class PresenceAvailInitialOutHandlerTestCase extends PresenceHandlerBaseT
         XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(null, null, null,
                 null, null, null).build());
 
-        Stanza stanza = handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true,
+        List<Stanza> stanzas = handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true,
                 sessionContext);
+        Stanza stanza = new ResponseStanzaContainerImpl(stanzas).getUniqueResponseStanza();
         // ... and will give an error:
         assertEquals("error", stanza.getAttribute("type").getValue());
         assertEquals(StanzaErrorCondition.UNKNOWN_SENDER.value(), stanza.getSingleInnerElementsNamed("error")
@@ -114,7 +118,8 @@ public class PresenceAvailInitialOutHandlerTestCase extends PresenceHandlerBaseT
         sessionContext.getServerRuntimeContext().getResourceRegistry().unbindResource(
                 anotherAvailableUser.getBoundResourceId());
         // 3 other resources got unbound, remaining one should now be unique
-        stanza = handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
+        stanzas = handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
+        stanza = new ResponseStanzaContainerImpl(stanzas).getUniqueResponseStanza();
         assertNull(stanza); // no return, esp no error stanza - all the handling is done through relays
         stanza = initiatingUser.getNextStanza();
         assertNull(stanza.getAttribute("type"));
@@ -125,7 +130,8 @@ public class PresenceAvailInitialOutHandlerTestCase extends PresenceHandlerBaseT
         boolean noRemainingBinds = sessionContext.getServerRuntimeContext().getResourceRegistry().unbindResource(
                 initiatingUser.getBoundResourceId());
         assertTrue(noRemainingBinds);
-        stanza = handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
+        stanzas = handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
+        stanza = new ResponseStanzaContainerImpl(stanzas).getUniqueResponseStanza();
         assertEquals("error", stanza.getAttribute("type").getValue());
         assertEquals(StanzaErrorCondition.UNKNOWN_SENDER.value(), stanza.getSingleInnerElementsNamed("error")
                 .getFirstInnerElement().getName());
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
index 3d8c867..aab0eb1 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
@@ -115,7 +115,7 @@ public class AbortHandlerTestCase extends TestCase {
         AbortHandler abortHandler = new AbortHandler();
         ResponseStanzaContainer responseContainer = abortHandler.execute(abortStanza, sessionContext
                 .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
-        Stanza responseStanza = responseContainer.getResponseStanza();
+        Stanza responseStanza = responseContainer.getUniqueResponseStanza();
         return responseStanza;
     }
 
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java
index 93a4ae6..51fe9dc 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java
@@ -75,7 +75,7 @@ public class AuthHandlerPlainMechanismTestCase extends TestCase {
         ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
                 .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
 
-        assertTrue(responseContainer.getResponseStanza().getVerifier().nameEquals("failure"));
+        assertTrue(responseContainer.getUniqueResponseStanza().getVerifier().nameEquals("failure"));
         assertTrue(sessionStateHolder.getState() == SessionState.ENCRYPTED);
     }
 
@@ -88,7 +88,7 @@ public class AuthHandlerPlainMechanismTestCase extends TestCase {
         ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
                 .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
 
-        assertTrue(responseContainer.getResponseStanza().getVerifier().nameEquals("failure"));
+        assertTrue(responseContainer.getUniqueResponseStanza().getVerifier().nameEquals("failure"));
         assertTrue(sessionStateHolder.getState() == SessionState.ENCRYPTED);
     }
 
@@ -103,7 +103,7 @@ public class AuthHandlerPlainMechanismTestCase extends TestCase {
         AuthHandler authHandler = new AuthHandler();
         ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
                 .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
-        Stanza responseStanza = responseContainer.getResponseStanza();
+        Stanza responseStanza = responseContainer.getUniqueResponseStanza();
 
         assertTrue(responseStanza.getVerifier().nameEquals("success"));
         assertTrue(sessionStateHolder.getState() == SessionState.AUTHENTICATED);
@@ -156,7 +156,7 @@ public class AuthHandlerPlainMechanismTestCase extends TestCase {
         AuthHandler authHandler = new AuthHandler();
         ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
                 .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
-        Stanza responseStanza = responseContainer.getResponseStanza();
+        Stanza responseStanza = responseContainer.getUniqueResponseStanza();
         return responseStanza;
     }
 
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandlerTestCase.java
index e276c67..65dfe19 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandlerTestCase.java
@@ -138,7 +138,7 @@ public class SessionIQHandlerTestCase {
             .startInnerElement("session", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SESSION)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(TO, null, IQStanzaType.RESULT, "id1").build();
         
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java
index b2e852c..a3c636f 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java
@@ -76,7 +76,7 @@ public class StartTLSHandlerTestCase extends TestCase {
         StartTLSHandler startTLSHandler = new StartTLSHandler();
         ResponseStanzaContainer responseStanzaContainer = startTLSHandler.execute(starttlsStanza, sessionContext
                 .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
-        Stanza responseStanza = responseStanzaContainer.getResponseStanza();
+        Stanza responseStanza = responseStanzaContainer.getUniqueResponseStanza();
         return responseStanza;
     }
 
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandlerTestCase.java
index 4de1030..cad43da 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandlerTestCase.java
@@ -149,7 +149,7 @@ public class PrivateDataIQHandlerTestCase {
             .startInnerElement("foo", NS)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(FROM, FROM, IQStanzaType.RESULT, "id1")
             .startInnerElement("query", NamespaceURIs.PRIVATE_DATA)
@@ -167,7 +167,7 @@ public class PrivateDataIQHandlerTestCase {
         .addAttribute("attr", "attrval")
         .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(FROM, FROM, IQStanzaType.RESULT, "id1")
         .startInnerElement("query", NamespaceURIs.PRIVATE_DATA)
@@ -184,7 +184,7 @@ public class PrivateDataIQHandlerTestCase {
             .startInnerElement("query", NamespaceURIs.PRIVATE_DATA)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.ERROR, "id1")
             .startInnerElement("query", NamespaceURIs.PRIVATE_DATA).endInnerElement()
@@ -204,7 +204,7 @@ public class PrivateDataIQHandlerTestCase {
             .startInnerElement("query", NamespaceURIs.PRIVATE_DATA)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.ERROR, "id1")
         .startInnerElement("query", NamespaceURIs.PRIVATE_DATA).endInnerElement()
@@ -226,7 +226,7 @@ public class PrivateDataIQHandlerTestCase {
         .startInnerElement("foo", NS)
         .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.ERROR, "id1")
         .startInnerElement("query", NamespaceURIs.PRIVATE_DATA)
@@ -255,7 +255,7 @@ public class PrivateDataIQHandlerTestCase {
             .addPreparedElement(stored)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(null, FROM, IQStanzaType.RESULT, "id1")
             .build();
@@ -274,7 +274,7 @@ public class PrivateDataIQHandlerTestCase {
             .startInnerElement("foo", NS)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.ERROR, "id1")
             .startInnerElement("query", NamespaceURIs.PRIVATE_DATA)
@@ -297,7 +297,7 @@ public class PrivateDataIQHandlerTestCase {
             .startInnerElement("foo", NS)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.ERROR, "id1")
         .startInnerElement("query", NamespaceURIs.PRIVATE_DATA)
@@ -318,7 +318,7 @@ public class PrivateDataIQHandlerTestCase {
             .startInnerElement("query", NamespaceURIs.PRIVATE_DATA)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.ERROR, "id1")
             .startInnerElement("query", NamespaceURIs.PRIVATE_DATA)
@@ -340,7 +340,7 @@ public class PrivateDataIQHandlerTestCase {
             .startInnerElement("foo", NS)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(null, FROM, IQStanzaType.ERROR, "id1")
             .build();
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandlerTestCase.java
index 5e00cd1..e502b9c 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandlerTestCase.java
@@ -161,7 +161,7 @@ public class VcardTempIQHandlerTestCase {
             .addPreparedElement(VCARD)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(FROM, FROM, IQStanzaType.RESULT, "id1")
             .addPreparedElement(VCARD)
@@ -178,7 +178,7 @@ public class VcardTempIQHandlerTestCase {
         .startInnerElement("vCard", NamespaceURIs.VCARD_TEMP)
         .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(FROM, FROM, IQStanzaType.RESULT, "id1")
         .startInnerElement("vCard", NamespaceURIs.VCARD_TEMP)
@@ -193,7 +193,7 @@ public class VcardTempIQHandlerTestCase {
             .startInnerElement("vCard", NamespaceURIs.VCARD_TEMP)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(OTHER, FROM, IQStanzaType.RESULT, "id1")
         .addPreparedElement(OTHER_VCARD)
@@ -210,7 +210,7 @@ public class VcardTempIQHandlerTestCase {
         .startInnerElement("vCard", NamespaceURIs.VCARD_TEMP)
         .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.ERROR, "id1")
         .startInnerElement("vCard", NamespaceURIs.VCARD_TEMP).endInnerElement()
@@ -230,7 +230,7 @@ public class VcardTempIQHandlerTestCase {
             .addPreparedElement(VCARD)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(null, FROM, IQStanzaType.RESULT, "id1")
             .build();
@@ -248,7 +248,7 @@ public class VcardTempIQHandlerTestCase {
             .addPreparedElement(VCARD)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.ERROR, "id1")
             .addPreparedElement(VCARD)
@@ -266,7 +266,7 @@ public class VcardTempIQHandlerTestCase {
             .startInnerElement("dummy", NamespaceURIs.VCARD_TEMP)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.ERROR, "id1")
             .startInnerElement("dummy", NamespaceURIs.VCARD_TEMP)
@@ -285,7 +285,7 @@ public class VcardTempIQHandlerTestCase {
             .addPreparedElement(OTHER_VCARD)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.ERROR, "id1")
             .addPreparedElement(OTHER_VCARD)
@@ -305,7 +305,7 @@ public class VcardTempIQHandlerTestCase {
             .addPreparedElement(VCARD)
             .build();
         
-        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(request, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         Stanza expected = StanzaBuilder.createIQStanza(null, FROM, IQStanzaType.ERROR, "id1")
             .build();
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep007_inbandreg/InBandRegistrationHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep007_inbandreg/InBandRegistrationHandlerTestCase.java
index 914d3e2..f67f691 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep007_inbandreg/InBandRegistrationHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep007_inbandreg/InBandRegistrationHandlerTestCase.java
@@ -73,7 +73,7 @@ public class InBandRegistrationHandlerTestCase {
         Stanza get = StanzaBuilder.createIQStanza(FROM, SERVER, IQStanzaType.GET, IQ_ID)
             .startInnerElement("query", NamespaceURIs.JABBER_IQ_REGISTER).build();
         
-        Stanza response = handler.execute(get, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(get, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         //        <iq type='result' id='reg1'>
         //            <query xmlns='jabber:iq:register'>
@@ -110,7 +110,7 @@ public class InBandRegistrationHandlerTestCase {
         Mockito.when(sessionContext.getState()).thenReturn(SessionState.AUTHENTICATED);
         Mockito.when(sessionContext.getInitiatingEntity()).thenReturn(EXISTING);
 
-        Stanza response = handler.execute(get, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(get, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         //        <iq type='result' id='reg1'>
         //            <query xmlns='jabber:iq:register'>
@@ -149,7 +149,7 @@ public class InBandRegistrationHandlerTestCase {
             .endInnerElement()
             .build();
         
-        Stanza response = handler.execute(set, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(set, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         //        <iq type='result' id='reg2'/>
         Assert.assertNotNull(response);
@@ -180,7 +180,7 @@ public class InBandRegistrationHandlerTestCase {
             .endInnerElement()
             .build();
         
-        Stanza response = handler.execute(set, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(set, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         //        <iq type='error' id='reg2'>
         //            <query xmlns='jabber:iq:register'>
@@ -227,7 +227,7 @@ public class InBandRegistrationHandlerTestCase {
             .endInnerElement()
             .build();
         
-        Stanza response = handler.execute(set, serverRuntimeContext, true, sessionContext, sessionStateHolder).getResponseStanza();
+        Stanza response = handler.execute(set, serverRuntimeContext, true, sessionContext, sessionStateHolder).getUniqueResponseStanza();
 
         //        <iq type='error' id='reg2'>
         //            <query xmlns='jabber:iq:register'>
@@ -277,7 +277,7 @@ public class InBandRegistrationHandlerTestCase {
         Mockito.when(sessionContext.getInitiatingEntity()).thenReturn(EXISTING);
 
         Stanza response = handler.execute(set, serverRuntimeContext, true, sessionContext, sessionStateHolder)
-                .getResponseStanza();
+                .getUniqueResponseStanza();
 
         //        <iq type='result' id='reg2'/>
         Assert.assertNotNull(response);
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandlerTestCase.java
index 2fbbce9..136b2e5 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandlerTestCase.java
@@ -26,6 +26,7 @@ import org.apache.vysper.xml.fragment.XMLSemanticError;
 import org.apache.vysper.xmpp.addressing.Entity;
 import org.apache.vysper.xmpp.addressing.EntityImpl;
 import org.apache.vysper.xmpp.protocol.NamespaceURIs;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainerImpl;
 import org.apache.vysper.xmpp.server.ServerRuntimeContext;
 import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.stanza.IQStanza;
@@ -36,6 +37,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import java.util.List;
+
 /**
  */
 public class SoftwareVersionIQHandlerTestCase {
@@ -127,7 +130,8 @@ public class SoftwareVersionIQHandlerTestCase {
 
     @Test
     public void handleGet() throws BindException, XMLSemanticError {
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         // <iq xmlns="jabber:client" type="result" id="1">
         // <query xmlns="jabber:iq:version"><name>Apache Vysper XMPP Server</name>
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java
index 4dd884c..c7fe926 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java
@@ -32,6 +32,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import static org.junit.Assert.assertFalse;
+
 /**
  */
 public class XmppPingIQHandlerTestCase {
@@ -79,43 +81,43 @@ public class XmppPingIQHandlerTestCase {
 
     @Test
     public void verifyNullStanza() {
-        Assert.assertFalse(handler.verify(null));
+        assertFalse(handler.verify(null));
     }
 
     @Test
     public void verifyInvalidName() {
-        Assert.assertFalse(handler.verify(buildStanza("dummy", NamespaceURIs.JABBER_CLIENT)));
+        assertFalse(handler.verify(buildStanza("dummy", NamespaceURIs.JABBER_CLIENT)));
     }
 
     @Test
     public void verifyInvalidNamespace() {
-        Assert.assertFalse(handler.verify(buildStanza("iq", "dummy")));
+        assertFalse(handler.verify(buildStanza("iq", "dummy")));
     }
 
     @Test
     public void verifyNullNamespace() {
-        Assert.assertFalse(handler.verify(buildStanza("iq", null)));
+        assertFalse(handler.verify(buildStanza("iq", null)));
     }
 
     @Test
     public void verifyNullInnerNamespace() {
-        Assert.assertFalse(handler.verify(buildStanza("iq", NamespaceURIs.JABBER_CLIENT, "ping", null)));
+        assertFalse(handler.verify(buildStanza("iq", NamespaceURIs.JABBER_CLIENT, "ping", null)));
     }
 
     @Test
     public void verifyInvalidInnerNamespace() {
-        Assert.assertFalse(handler.verify(buildStanza("iq", NamespaceURIs.JABBER_CLIENT, "ping", "dummy")));
+        assertFalse(handler.verify(buildStanza("iq", NamespaceURIs.JABBER_CLIENT, "ping", "dummy")));
     }
     
     @Test
     public void verifyInvalidInnerName() {
-        Assert.assertFalse(handler.verify(buildStanza("iq", NamespaceURIs.JABBER_CLIENT, "dummy", NamespaceURIs.URN_XMPP_PING)));
+        assertFalse(handler.verify(buildStanza("iq", NamespaceURIs.JABBER_CLIENT, "dummy", NamespaceURIs.URN_XMPP_PING)));
     }
 
     @Test
     public void verifyMissingInnerElement() {
         Stanza stanza = new StanzaBuilder("iq", NamespaceURIs.JABBER_CLIENT).build();
-        Assert.assertFalse(handler.verify(stanza));
+        assertFalse(handler.verify(stanza));
     }
     
     @Test
@@ -140,7 +142,7 @@ public class XmppPingIQHandlerTestCase {
         .addAttribute("id", "dummy-1")
         .build();
         
-        Assert.assertFalse(handler.verify(stanza));
+        assertFalse(handler.verify(stanza));
     }
     
     @Test
@@ -167,7 +169,7 @@ public class XmppPingIQHandlerTestCase {
         // we should always get a response
         Assert.assertTrue(resp.hasResponse());
 
-        Stanza respStanza = resp.getResponseStanza();
+        Stanza respStanza = resp.getUniqueResponseStanza();
 
         Assert.assertEquals("iq", respStanza.getName());
         Assert.assertEquals(boundClient, respStanza.getTo());
@@ -194,7 +196,7 @@ public class XmppPingIQHandlerTestCase {
         ResponseStanzaContainer resp = handler.execute(stanza, sessionContext.getServerRuntimeContext(), true,
                 sessionContext, null);
 
-        Assert.assertNull(resp);
+        assertFalse(resp.hasResponse());
         
         Mockito.verify(pinger1).pong(IQ_ID);
         Mockito.verify(pinger1).pong(IQ_ID);
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandlerTestCase.java
index 78af24a..a6f5d5c 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandlerTestCase.java
@@ -19,6 +19,7 @@
  */
 package org.apache.vysper.xmpp.modules.extension.xep0202_entity_time;
 
+import java.util.List;
 import java.util.regex.Pattern;
 
 import junit.framework.Assert;
@@ -26,6 +27,8 @@ import junit.framework.Assert;
 import org.apache.vysper.xml.fragment.XMLElement;
 import org.apache.vysper.xml.fragment.XMLSemanticError;
 import org.apache.vysper.xmpp.protocol.NamespaceURIs;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainerImpl;
 import org.apache.vysper.xmpp.server.ServerRuntimeContext;
 import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.stanza.IQStanza;
@@ -119,7 +122,8 @@ public class EntityTimeIQHandlerTestCase {
 
     @Test
     public void handleGet() throws BindException, XMLSemanticError {
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Assert.assertNotNull(response);
         Assert.assertEquals("iq", response.getName());
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandlerTestCase.java
index df41e4d..60376fc 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandlerTestCase.java
@@ -19,6 +19,7 @@
  */
 package org.apache.vysper.xmpp.modules.extension.xep0202_entity_time;
 
+import java.util.List;
 import java.util.regex.Pattern;
 
 import junit.framework.Assert;
@@ -26,6 +27,7 @@ import junit.framework.Assert;
 import org.apache.vysper.xml.fragment.XMLElement;
 import org.apache.vysper.xml.fragment.XMLSemanticError;
 import org.apache.vysper.xmpp.protocol.NamespaceURIs;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainerImpl;
 import org.apache.vysper.xmpp.server.ServerRuntimeContext;
 import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.stanza.IQStanza;
@@ -119,7 +121,8 @@ public class EntityTimeXEP0090IQHandlerTestCase {
 
     @Test
     public void handleGet() throws BindException, XMLSemanticError {
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Assert.assertNotNull(response);
         Assert.assertEquals("iq", response.getName());
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandlerTestCase.java
index b50912a..f7118ac 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandlerTestCase.java
@@ -68,7 +68,7 @@ public class DbVerifyHandlerTestCase extends TestCase {
         .addText(token)
         .build();
         
-        Stanza response = handler.execute(stanza, serverRuntimeContext, false, null, null).getResponseStanza();
+        Stanza response = handler.execute(stanza, serverRuntimeContext, false, null, null).getUniqueResponseStanza();
         
         Assert.assertNotNull(response);
         Assert.assertEquals(TO, response.getFrom());
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
index 18706a8..9710db2 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
@@ -37,6 +37,7 @@ import org.apache.vysper.xmpp.modules.servicediscovery.management.InfoElement;
 import org.apache.vysper.xmpp.modules.servicediscovery.management.InfoRequest;
 import org.apache.vysper.xmpp.modules.servicediscovery.management.ServiceDiscoveryRequestException;
 import org.apache.vysper.xmpp.protocol.NamespaceURIs;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainerImpl;
 import org.apache.vysper.xmpp.server.ServerRuntimeContext;
 import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.server.components.ComponentStanzaProcessor;
@@ -164,8 +165,8 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         
         when(serviceCollector.processServerInfoRequest(any(InfoRequest.class))).thenReturn(infoElements);
         
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
-        
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         StanzaAssert.assertEquals(createExpectedResponse(SERVER), response);
     }
 
@@ -176,8 +177,9 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         when(serverRuntimeContext.getComponentStanzaProcessor(COMPONENT)).thenReturn(componentStanzaProcessor);
         
         when(serviceCollector.processComponentInfoRequest(any(InfoRequest.class))).thenReturn(infoElements);
-        
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         StanzaAssert.assertEquals(createExpectedResponse(COMPONENT), response);
     }
@@ -187,8 +189,9 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         IQStanza stanza = createRequest(USER);
         
         when(serviceCollector.processInfoRequest(any(InfoRequest.class))).thenReturn(infoElements);
-        
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         StanzaAssert.assertEquals(createExpectedResponse(USER), response);
     }
@@ -199,7 +202,8 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         
         IQStanza stanza = createRequest(USER_WITH_RESOURCE);
         
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Assert.assertNull(response);
         
@@ -212,7 +216,8 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         
         IQStanza stanza = createRequest(USER_WITH_RESOURCE);
         
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Assert.assertNull(response);
         
@@ -226,7 +231,8 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         when(serverRuntimeContext.getComponentStanzaProcessor(COMPONENT)).thenReturn(null);
         when(serviceCollector.processComponentInfoRequest(any(InfoRequest.class))).thenReturn(infoElements);
         
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Stanza expected = createErrorResponse(COMPONENT, "item-not-found");
 
@@ -240,7 +246,8 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         when(serverRuntimeContext.getServerRuntimeContextService(ServiceDiscoveryRequestListenerRegistry.SERVICE_DISCOVERY_REQUEST_LISTENER_REGISTRY))
             .thenReturn(null);
             
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Stanza expected = createErrorResponse(SERVER, "internal-server-error");
         
@@ -253,7 +260,8 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         
         when(serviceCollector.processServerInfoRequest(any(InfoRequest.class))).thenThrow(new ServiceDiscoveryRequestException(StanzaErrorCondition.INTERNAL_SERVER_ERROR));
         
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Stanza expected = createErrorResponse(SERVER, "internal-server-error");
         
@@ -267,7 +275,8 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         when(serverRuntimeContext.getComponentStanzaProcessor(COMPONENT)).thenReturn(componentStanzaProcessor);
         when(serviceCollector.processComponentInfoRequest(any(InfoRequest.class))).thenThrow(new ServiceDiscoveryRequestException(StanzaErrorCondition.INTERNAL_SERVER_ERROR));
         
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Stanza expected = createErrorResponse(COMPONENT, "internal-server-error");
         
@@ -280,7 +289,8 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         
         when(serviceCollector.processInfoRequest(any(InfoRequest.class))).thenThrow(new ServiceDiscoveryRequestException(StanzaErrorCondition.INTERNAL_SERVER_ERROR));
         
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Stanza expected = createErrorResponse(SERVER, "internal-server-error");
         
@@ -292,8 +302,9 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         when(sessionContext.getInitiatingEntity()).thenReturn(FROM);
         
         IQStanza stanza = createRequest(USER, IQStanzaType.RESULT);
-        
-        Stanza response = handler.handleResult(stanza, serverRuntimeContext, sessionContext);
+
+        List<Stanza> responses = handler.handleResult(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Assert.assertNull(response);
         
@@ -305,8 +316,9 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
         when(sessionContext.getInitiatingEntity()).thenReturn(USER);
         
         IQStanza stanza = createRequest(USER, IQStanzaType.RESULT);
-        
-        Stanza response = handler.handleResult(stanza, serverRuntimeContext, sessionContext);
+
+        List<Stanza> responses = handler.handleResult(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Assert.assertNull(response);
         
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java
index b701c80..b1461a3 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java
@@ -37,6 +37,8 @@ import org.apache.vysper.xmpp.modules.servicediscovery.management.InfoRequest;
 import org.apache.vysper.xmpp.modules.servicediscovery.management.InfoRequestListener;
 import org.apache.vysper.xmpp.modules.servicediscovery.management.ServiceDiscoveryRequestException;
 import org.apache.vysper.xmpp.protocol.NamespaceURIs;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainerImpl;
 import org.apache.vysper.xmpp.protocol.SessionStateHolder;
 import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
 import org.apache.vysper.xmpp.server.TestSessionContext;
@@ -82,12 +84,13 @@ public class ExtendedDiscoInfoTestCase extends TestCase {
 
         IQStanza finalStanza = (IQStanza) XMPPCoreStanza.getWrapper(request.build());
 
-        Stanza resultStanza = infoIQHandler.handleGet(finalStanza, runtimeContext, new TestSessionContext(
+        List<Stanza> resultStanza = infoIQHandler.handleGet(finalStanza, runtimeContext, new TestSessionContext(
                 runtimeContext, new SessionStateHolder()));
 
-        assertTrue(resultStanza.getVerifier().onlySubelementEquals("query",
+        ResponseStanzaContainer responseStanzaContainer = new ResponseStanzaContainerImpl(resultStanza);
+        assertTrue(responseStanzaContainer.getUniqueResponseStanza().getVerifier().onlySubelementEquals("query",
                 NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO));
-        XMLElement queryElement = resultStanza.getFirstInnerElement();
+        XMLElement queryElement = responseStanzaContainer.getUniqueResponseStanza().getFirstInnerElement();
         XMLElementVerifier queryVerifier = queryElement.getVerifier();
         assertTrue(queryVerifier.subElementsPresentExact(4));
         List<XMLElement> innerElements = queryElement.getInnerElements();
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java b/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java
index 6685196..a5613a6 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java
@@ -24,6 +24,9 @@ import org.apache.vysper.xmpp.server.ServerRuntimeContext;
 import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.stanza.Stanza;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  */
 public class CallTestStanzaHandlerResponse extends CallTestStanzaHandler implements ResponseStanzaContainer {
@@ -38,14 +41,19 @@ public class CallTestStanzaHandlerResponse extends CallTestStanzaHandler impleme
             boolean isOutboundStanza, SessionContext sessionContext, SessionStateHolder sessionStateHolder)
             throws ProtocolException {
         super.execute(stanza, serverRuntimeContext, true, sessionContext, null);
-        return new ResponseStanzaContainerImpl(getResponseStanza());
+        return new ResponseStanzaContainerImpl(getResponseStanzas());
     }
 
     public void setResponseStanza(Stanza response) {
         this.response = response;
     }
 
-    public Stanza getResponseStanza() {
+    public List<Stanza> getResponseStanzas() {
+        return Collections.singletonList(response);
+    }
+
+    @Override
+    public Stanza getUniqueResponseStanza() {
         return response;
     }
 
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
index 07455b8..6a89e74 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
@@ -119,7 +119,7 @@ public class ProtocolWorkerProcessTestCase extends TestCase {
         stanzaHandler.setResponseStanza(null);
         protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza,
                 sessionStateHolder);
-        assertNull("handler emmitted null as response", stanzaHandler.getResponseStanza());
+        assertNull("handler emmitted null as response", stanzaHandler.getUniqueResponseStanza());
 
     }
 
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandlerTestCase.java
index 0914e38..de1b133 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandlerTestCase.java
@@ -112,7 +112,7 @@ public class FeaturesHandlerTestCase {
         
         Stanza expectedResponse = new StanzaBuilder("starttls", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS).build();
         
-        StanzaAssert.assertEquals(expectedResponse, response.getResponseStanza());
+        StanzaAssert.assertEquals(expectedResponse, response.getUniqueResponseStanza());
     }
 
     @Test
@@ -126,7 +126,7 @@ public class FeaturesHandlerTestCase {
         
         ResponseStanzaContainer response = handler.execute(stanza, serverRuntimeContext, true, sessionContext, sessionStateHolder);
         
-        assertDialbackStanza(response.getResponseStanza());
+        assertDialbackStanza(response.getUniqueResponseStanza());
     }
 
     @Test
@@ -137,7 +137,7 @@ public class FeaturesHandlerTestCase {
         
         ResponseStanzaContainer response = handler.execute(stanza, serverRuntimeContext, true, sessionContext, sessionStateHolder);
         
-        assertDialbackStanza(response.getResponseStanza());
+        assertDialbackStanza(response.getUniqueResponseStanza());
     }
 
     @Test
diff --git a/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCHandlerHelper.java b/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCHandlerHelper.java
index e5053a9..efa4397 100644
--- a/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCHandlerHelper.java
+++ b/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCHandlerHelper.java
@@ -20,6 +20,7 @@
 package org.apache.vysper.xmpp.modules.extension.xep0045_muc.handler;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.xml.fragment.XMLElement;
diff --git a/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCIqAdminHandler.java b/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCIqAdminHandler.java
index c08f701..02cb239 100644
--- a/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCIqAdminHandler.java
+++ b/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCIqAdminHandler.java
@@ -20,6 +20,7 @@
 package org.apache.vysper.xmpp.modules.extension.xep0045_muc.handler;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.xml.fragment.XMLElement;
@@ -81,7 +82,7 @@ public class MUCIqAdminHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         try {
             Entity roomEntity = stanza.getTo();
             Room room = conference.findRoom(roomEntity);
@@ -99,11 +100,11 @@ public class MUCIqAdminHandler extends DefaultIQHandler {
                 // check access
                 if(affiliation == Affiliation.Outcast || affiliation == Affiliation.Member) {
                     if(fromAffiliation.compareTo(Affiliation.Admin) > 0) {
-                        return MUCHandlerHelper.createErrorReply(stanza, StanzaErrorType.CANCEL, StanzaErrorCondition.NOT_ALLOWED);
+                        return Collections.singletonList(MUCHandlerHelper.createErrorReply(stanza, StanzaErrorType.CANCEL, StanzaErrorCondition.NOT_ALLOWED));
                     }
                 } else if(affiliation == Affiliation.Owner || affiliation == Affiliation.Admin) {
                     if(fromAffiliation.compareTo(Affiliation.Owner) > 0) {
-                        return MUCHandlerHelper.createErrorReply(stanza, StanzaErrorType.CANCEL, StanzaErrorCondition.NOT_ALLOWED);
+                        return Collections.singletonList(MUCHandlerHelper.createErrorReply(stanza, StanzaErrorType.CANCEL, StanzaErrorCondition.NOT_ALLOWED));
                     }
                 }
 
@@ -117,20 +118,20 @@ public class MUCIqAdminHandler extends DefaultIQHandler {
                 }
             }
             
-            return result.build();
+            return Collections.singletonList(result.build());
             
         } catch (XMLSemanticError e) {
             logger.debug("Invalid MUC admin stanza", e);
-            return createBadRequestError(stanza, serverRuntimeContext, sessionContext,
-                    "Invalid IQ stanza");
+            return Collections.singletonList(createBadRequestError(stanza, serverRuntimeContext, sessionContext,
+                    "Invalid IQ stanza"));
         } catch (EntityFormatException e) {
-            return createBadRequestError(stanza, serverRuntimeContext, sessionContext,
-                    "Invalid JID");
+            return Collections.singletonList(createBadRequestError(stanza, serverRuntimeContext, sessionContext,
+                    "Invalid JID"));
         }
     }
 
     @Override
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         logger.debug("Received MUC admin stanza");
         
         Room room = conference.findRoom(stanza.getTo());
@@ -142,7 +143,7 @@ public class MUCIqAdminHandler extends DefaultIQHandler {
             // only moderators are allowed to continue
             logger.debug("Only moderators are allowed to issue admin stanzas");
             
-            return MUCHandlerHelper.createErrorReply(stanza, StanzaErrorType.AUTH, StanzaErrorCondition.FORBIDDEN);
+            return Collections.singletonList(MUCHandlerHelper.createErrorReply(stanza, StanzaErrorType.AUTH, StanzaErrorCondition.FORBIDDEN));
         }
         try {
             XMLElement query = stanza.getSingleInnerElementsNamed("query", NamespaceURIs.XEP0045_MUC_ADMIN);
@@ -154,8 +155,8 @@ public class MUCIqAdminHandler extends DefaultIQHandler {
                 try {
                     item = IqAdminItem.getWrapper(itemElement);
                 } catch (EntityFormatException e) {
-                    return createBadRequestError(stanza, serverRuntimeContext, sessionContext,
-                        "Invalid JID");
+                    return Collections.singletonList(createBadRequestError(stanza, serverRuntimeContext, sessionContext,
+                        "Invalid JID"));
                 }
     
                 
@@ -167,19 +168,19 @@ public class MUCIqAdminHandler extends DefaultIQHandler {
                     result = changeAffiliation(stanza, serverRuntimeContext, sessionContext, item, room, moderator);
                 } else {
                     logger.debug("Invalid MUC admin stanza");
-                    return createBadRequestError(stanza, serverRuntimeContext, sessionContext, "Unknown IQ stanza");
+                    return Collections.singletonList(createBadRequestError(stanza, serverRuntimeContext, sessionContext, "Unknown IQ stanza"));
                 }
 
                 // give up on error
                 if("error".equals(result.getAttributeValue("type"))) {
-                    return result;
+                    return Collections.singletonList(result);
                 }
             }
-            return result;
+            return Collections.singletonList(result);
         } catch (XMLSemanticError e) {
             logger.debug("Invalid MUC admin stanza", e);
-            return createBadRequestError(stanza, serverRuntimeContext, sessionContext,
-                    "Invalid IQ stanza");
+            return Collections.singletonList(createBadRequestError(stanza, serverRuntimeContext, sessionContext,
+                    "Invalid IQ stanza"));
         }
     }
 
diff --git a/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java b/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java
index 5158afc..9dce09d 100644
--- a/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java
+++ b/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java
@@ -20,6 +20,7 @@
 package org.apache.vysper.xmpp.modules.extension.xep0045_muc.handler;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.compliance.SpecCompliance;
@@ -82,14 +83,14 @@ public class MUCMessageHandler extends DefaultMessageHandler {
         return true;
     }
 
-    private Stanza createMessageErrorStanza(Entity from, Entity to, String id, StanzaErrorType type,
+    private List<Stanza> createMessageErrorStanza(Entity from, Entity to, String id, StanzaErrorType type,
             StanzaErrorCondition errorCondition, Stanza stanza) {
-        return MUCHandlerHelper.createErrorStanza("message", NamespaceURIs.JABBER_CLIENT, from, to, id, type.value(),
-                errorCondition.value(), stanza.getInnerElements());
+        return Collections.singletonList(MUCHandlerHelper.createErrorStanza("message", NamespaceURIs.JABBER_CLIENT, from, to, id, type.value(),
+                errorCondition.value(), stanza.getInnerElements()));
     }
 
     @Override
-    protected Stanza executeMessageLogic(MessageStanza stanza, ServerRuntimeContext serverRuntimeContext,
+    protected List<Stanza> executeMessageLogic(MessageStanza stanza, ServerRuntimeContext serverRuntimeContext,
             SessionContext sessionContext) {
 
         logger.debug("Received message for MUC");
@@ -212,10 +213,10 @@ public class MUCMessageHandler extends DefaultMessageHandler {
             }
         }
 
-        return null;
+        return Collections.emptyList();
     }
 
-    private Stanza handleInvites(MessageStanza stanza, Entity from, Occupant sendingOccupant, Room room,
+    private List<Stanza> handleInvites(MessageStanza stanza, Entity from, Occupant sendingOccupant, Room room,
             ServerRuntimeContext serverRuntimeContext) {
         X x = X.fromStanza(stanza);
         if (x != null && x.getInvite() != null) {
@@ -249,7 +250,7 @@ public class MUCMessageHandler extends DefaultMessageHandler {
                     StanzaErrorCondition.UNEXPECTED_REQUEST, stanza);
         }
         
-        return null;
+        return Collections.emptyList();
     }
 
     private void handleVoiceRequest(Entity from, Occupant sendingOccupant, Room room, Stanza stanza,
diff --git a/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java b/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java
index b0e99d9..9fd2b8d 100644
--- a/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java
+++ b/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java
@@ -22,6 +22,7 @@ package org.apache.vysper.xmpp.modules.extension.xep0045_muc.handler;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.compliance.SpecCompliant;
@@ -79,17 +80,17 @@ public class MUCPresenceHandler extends DefaultPresenceHandler {
         return true;
     }
 
-    private Stanza createPresenceErrorStanza(Entity from, Entity to, String id, String type, String errorName) {
+    private List<Stanza> createPresenceErrorStanza(Entity from, Entity to, String id, String type, String errorName) {
         // "Note: If an error occurs in relation to joining a room, the service SHOULD include 
         // the MUC child element (i.e., <x xmlns='http://jabber.org/protocol/muc'/>) in the 
         // <presence/> stanza of type "error"."
 
-        return MUCHandlerHelper.createErrorStanza("presence", NamespaceURIs.JABBER_CLIENT, from, to, id, type,
-                errorName, Arrays.asList((XMLElement) new X()));
+        return Collections.singletonList(MUCHandlerHelper.createErrorStanza("presence", NamespaceURIs.JABBER_CLIENT, from, to, id, type,
+                errorName, Arrays.asList((XMLElement) new X())));
     }
 
     @Override
-    protected Stanza executePresenceLogic(PresenceStanza stanza, ServerRuntimeContext serverRuntimeContext,
+    protected List<Stanza> executePresenceLogic(PresenceStanza stanza, ServerRuntimeContext serverRuntimeContext,
             SessionContext sessionContext) {
         // TODO handle null
         Entity roomAndNick = stanza.getTo();
@@ -147,7 +148,7 @@ public class MUCPresenceHandler extends DefaultPresenceHandler {
         }
     }
 
-    private Stanza available(PresenceStanza stanza, Entity roomJid, Entity newOccupantJid, String nick,
+    private List<Stanza> available(PresenceStanza stanza, Entity roomJid, Entity newOccupantJid, String nick,
             ServerRuntimeContext serverRuntimeContext) {
 
         boolean newRoom = false;
@@ -286,7 +287,7 @@ public class MUCPresenceHandler extends DefaultPresenceHandler {
         return null;
     }
 
-    private Stanza unavailable(PresenceStanza stanza, Entity roomJid, Entity occupantJid, String nick,
+    private List<Stanza> unavailable(PresenceStanza stanza, Entity roomJid, Entity occupantJid, String nick,
             ServerRuntimeContext serverRuntimeContext) {
         Room room = conference.findRoom(roomJid);
 
diff --git a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
index afe36a0..d4f6e50 100644
--- a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
+++ b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
@@ -85,7 +85,7 @@ public abstract class AbstractDiscoTestCase extends TestCase {
 
         ResponseStanzaContainer resultStanzaContainer = infoIQHandler.execute(request.build(), serverRuntimeContext,
                 false, new TestSessionContext(serverRuntimeContext, new SessionStateHolder()), null);
-        Stanza resultStanza = resultStanzaContainer.getResponseStanza();
+        Stanza resultStanza = resultStanzaContainer.getUniqueResponseStanza();
 
         assertEquals("Disco request must not return error", "result", resultStanza.getAttributeValue("type"));
         XMLElement queryElement = resultStanza.getFirstInnerElement();
diff --git a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
index 3e78593..58e97e1 100644
--- a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
+++ b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
@@ -39,7 +39,7 @@ public abstract class AbstractMUCOccupantDiscoTestCase extends AbstractMUCHandle
         ResponseStanzaContainer container = handler.execute(stanza, sessionContext.getServerRuntimeContext(), true,
                 sessionContext, null);
         if (container != null) {
-            return container.getResponseStanza();
+            return container.getUniqueResponseStanza();
         } else {
             return null;
         }
diff --git a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java
index cd471b6..b8b4a25 100644
--- a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java
+++ b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java
@@ -272,7 +272,7 @@ public abstract class AbstractMUCHandlerTestCase extends TestCase {
         ResponseStanzaContainer container = handler.execute(iqStanza, sessionContext.getServerRuntimeContext(), true,
                 sessionContext, null);
         if (container != null) {
-            return container.getResponseStanza();
+            return container.getUniqueResponseStanza();
         } else {
             return null;
         }
diff --git a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java
index 4ff64d1..f06e2bd 100644
--- a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java
+++ b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java
@@ -64,7 +64,7 @@ public abstract class AbstractMUCMessageHandlerTestCase extends AbstractMUCHandl
         ResponseStanzaContainer container = handler.execute(messageStanza, sessionContext.getServerRuntimeContext(),
                 true, sessionContext, null);
         if (container != null) {
-            return container.getResponseStanza();
+            return container.getUniqueResponseStanza();
         } else {
             return null;
         }
diff --git a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeNickTestCase.java b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeNickTestCase.java
index 90c887d..ac449fe 100644
--- a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeNickTestCase.java
+++ b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeNickTestCase.java
@@ -51,7 +51,7 @@ public class ChangeNickTestCase extends AbstractMUCHandlerTestCase {
         ResponseStanzaContainer container = handler.execute(presenceStanza, sessionContext.getServerRuntimeContext(),
                 true, sessionContext, null);
         if (container != null) {
-            return container.getResponseStanza();
+            return container.getUniqueResponseStanza();
         } else {
             return null;
         }
diff --git a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeStatusTestCase.java b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeStatusTestCase.java
index 1129d52..7b91f16 100644
--- a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeStatusTestCase.java
+++ b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeStatusTestCase.java
@@ -46,7 +46,7 @@ public class ChangeStatusTestCase extends AbstractMUCHandlerTestCase {
         ResponseStanzaContainer container = handler.execute(presenceStanza, sessionContext.getServerRuntimeContext(),
                 true, sessionContext, null);
         if (container != null) {
-            return container.getResponseStanza();
+            return container.getUniqueResponseStanza();
         } else {
             return null;
         }
diff --git a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/EnterRoomTestCase.java b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/EnterRoomTestCase.java
index b99e52f..73e3fe4 100644
--- a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/EnterRoomTestCase.java
+++ b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/EnterRoomTestCase.java
@@ -79,7 +79,7 @@ public class EnterRoomTestCase extends AbstractMUCHandlerTestCase {
         ResponseStanzaContainer container = handler.execute(presenceStanza, userSessionContext
                 .getServerRuntimeContext(), true, userSessionContext, null);
         if (container != null) {
-            return container.getResponseStanza();
+            return container.getUniqueResponseStanza();
         } else {
             return null;
         }
diff --git a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ExitRoomTestCase.java b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ExitRoomTestCase.java
index 353e2f1..b1526b3 100644
--- a/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ExitRoomTestCase.java
+++ b/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ExitRoomTestCase.java
@@ -52,7 +52,7 @@ public class ExitRoomTestCase extends AbstractMUCHandlerTestCase {
         ResponseStanzaContainer container = handler.execute(presenceStanza, sessionContext.getServerRuntimeContext(),
                 true, sessionContext, null);
         if (container != null) {
-            return container.getResponseStanza();
+            return container.getUniqueResponseStanza();
         } else {
             return null;
         }
diff --git a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java
index fa6fff0..93da169 100644
--- a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java
+++ b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java
@@ -32,6 +32,9 @@ import org.apache.vysper.xmpp.stanza.IQStanzaType;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * This handler is responsible for dealing with the "create" requests (in the pubsub namespace).
  * Even though this sounds like a "owner" action, it actually lies within the general "pubsub" namespace.
@@ -68,7 +71,7 @@ public class PubSubCreateNodeHandler extends AbstractPubSubGeneralHandler {
             @SpecCompliant(spec = "xep-0060", section = "8.1.1", status = SpecCompliant.ComplianceStatus.IN_PROGRESS, coverage = SpecCompliant.ComplianceCoverage.PARTIAL),
             @SpecCompliant(spec = "xep-0060", section = "8.1.2", status = SpecCompliant.ComplianceStatus.NOT_STARTED, coverage = SpecCompliant.ComplianceCoverage.UNSUPPORTED),
             @SpecCompliant(spec = "xep-0060", section = "8.1.3", status = SpecCompliant.ComplianceStatus.NOT_STARTED, coverage = SpecCompliant.ComplianceCoverage.UNSUPPORTED) })
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity serverJID = serviceConfiguration.getDomainJID();
         CollectionNode root = serviceConfiguration.getRootNode();
 
@@ -79,12 +82,12 @@ public class PubSubCreateNodeHandler extends AbstractPubSubGeneralHandler {
         String nodeName = extractNodeName(stanza);
 
         if (root.find(nodeName) != null) {
-            return errorStanzaGenerator.generateDuplicateNodeErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateDuplicateNodeErrorStanza(sender, serverJID, stanza));
         }
 
         LeafNode node = new LeafNode(serviceConfiguration, nodeName, sender);
         root.add(node);
 
-        return new IQStanza(sb.build());
+        return Collections.singletonList(new IQStanza(sb.build()));
     }
 }
diff --git a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
index 917a96e..f92a5ac 100644
--- a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
+++ b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
@@ -39,6 +39,9 @@ import org.apache.vysper.xmpp.stanza.IQStanzaType;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * This class handles the "publish" use cases for the "pubsub" namespace.
  * 
@@ -80,7 +83,7 @@ public class PubSubPublishHandler extends AbstractPubSubGeneralHandler {
             @SpecCompliant(spec = "xep-0060", section = "7.1.3.4", status = SpecCompliant.ComplianceStatus.NOT_STARTED, coverage = SpecCompliant.ComplianceCoverage.UNSUPPORTED),
             @SpecCompliant(spec = "xep-0060", section = "7.1.3.5", status = SpecCompliant.ComplianceStatus.NOT_STARTED, coverage = SpecCompliant.ComplianceCoverage.UNSUPPORTED),
             @SpecCompliant(spec = "xep-0060", section = "7.1.3.6", status = SpecCompliant.ComplianceStatus.NOT_STARTED, coverage = SpecCompliant.ComplianceCoverage.UNSUPPORTED) })
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity serverJID = serviceConfiguration.getDomainJID();
         CollectionNode root = serviceConfiguration.getRootNode();
 
@@ -99,12 +102,12 @@ public class PubSubPublishHandler extends AbstractPubSubGeneralHandler {
 
         if (node == null) {
             // node does not exist - error condition 3 (7.1.3)
-            return errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza));
         }
 
         if (!node.isAuthorized(sender, PubSubPrivilege.PUBLISH)) {
             // not enough privileges to publish - error condition 1 (7.1.3)
-            return errorStanzaGenerator.generateInsufficientPrivilegesErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateInsufficientPrivilegesErrorStanza(sender, serverJID, stanza));
         }
 
         StanzaRelay relay = serverRuntimeContext.getStanzaRelay();
@@ -129,7 +132,7 @@ public class PubSubPublishHandler extends AbstractPubSubGeneralHandler {
         buildSuccessStanza(sb, nodeName, strID);
 
         sb.endInnerElement(); // pubsub
-        return new IQStanza(sb.build());
+        return Collections.singletonList(new IQStanza(sb.build()));
     }
 
     /**
diff --git a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java
index 37262c7..8474c93 100644
--- a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java
+++ b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java
@@ -19,6 +19,7 @@
  */
 package org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.handler;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.compliance.SpecCompliant;
@@ -66,7 +67,7 @@ public class PubSubRetrieveAffiliationsHandler extends AbstractPubSubGeneralHand
      * @return the appropriate response stanza
      */
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity serverJID = serviceConfiguration.getDomainJID();
         CollectionNode root = serviceConfiguration.getRootNode();
 
@@ -81,7 +82,7 @@ public class PubSubRetrieveAffiliationsHandler extends AbstractPubSubGeneralHand
         buildSuccessStanza(sb, subscriptions);
 
         sb.endInnerElement(); // pubsub
-        return new IQStanza(sb.build());
+        return Collections.singletonList(new IQStanza(sb.build()));
     }
 
     /**
diff --git a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java
index bc93656..13029b1 100644
--- a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java
+++ b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java
@@ -68,7 +68,7 @@ public class PubSubRetrieveSubscriptionsHandler extends AbstractPubSubGeneralHan
      * @return the appropriate response stanza
      */
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity serverJID = serviceConfiguration.getDomainJID();
         CollectionNode root = serviceConfiguration.getRootNode();
 
@@ -84,7 +84,7 @@ public class PubSubRetrieveSubscriptionsHandler extends AbstractPubSubGeneralHan
         buildSuccessStanza(sb, nodeName, subscriptions);
 
         sb.endInnerElement(); // pubsub
-        return new IQStanza(sb.build());
+        return Collections.singletonList(new IQStanza(sb.build()));
     }
 
     /**
diff --git a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
index a164e99..732f330 100644
--- a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
+++ b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
@@ -36,6 +36,9 @@ import org.apache.vysper.xmpp.stanza.IQStanzaType;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * This class handles the "subscribe" use cases for the "pubsub" namespace.
  * 
@@ -80,7 +83,7 @@ public class PubSubSubscribeHandler extends AbstractPubSubGeneralHandler {
             @SpecCompliant(spec = "xep-0060", section = "6.1.3.9", status = SpecCompliant.ComplianceStatus.NOT_STARTED, coverage = SpecCompliant.ComplianceCoverage.UNSUPPORTED),
             @SpecCompliant(spec = "xep-0060", section = "6.1.3.10", status = SpecCompliant.ComplianceStatus.NOT_STARTED, coverage = SpecCompliant.ComplianceCoverage.UNSUPPORTED),
             @SpecCompliant(spec = "xep-0060", section = "6.1.3.11", status = SpecCompliant.ComplianceStatus.FINISHED, coverage = SpecCompliant.ComplianceCoverage.COMPLETE) })
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity serverJID = serviceConfiguration.getDomainJID();
         CollectionNode root = serviceConfiguration.getRootNode();
 
@@ -96,12 +99,12 @@ public class PubSubSubscribeHandler extends AbstractPubSubGeneralHandler {
         try {
             subJID = EntityImpl.parse(strSubJID);
         } catch (EntityFormatException e) {
-            return errorStanzaGenerator.generateJIDMalformedErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateJIDMalformedErrorStanza(sender, serverJID, stanza));
         }
 
         if (!sender.getBareJID().equals(subJID.getBareJID())) {
             // error condition 1 (6.1.3)
-            return errorStanzaGenerator.generateJIDDontMatchErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateJIDDontMatchErrorStanza(sender, serverJID, stanza));
         }
 
         String nodeName = extractNodeName(stanza);
@@ -109,7 +112,7 @@ public class PubSubSubscribeHandler extends AbstractPubSubGeneralHandler {
 
         if (node == null) {
             // no such node (error condition 11 (6.1.3))
-            return errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza));
         }
 
         String id = idGenerator.create();
@@ -118,7 +121,7 @@ public class PubSubSubscribeHandler extends AbstractPubSubGeneralHandler {
         buildSuccessStanza(sb, nodeName, strSubJID, id);
 
         sb.endInnerElement(); // pubsub
-        return new IQStanza(sb.build());
+        return Collections.singletonList(new IQStanza(sb.build()));
     }
 
     /**
diff --git a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
index d7d700d..362f781 100644
--- a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
+++ b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
@@ -37,6 +37,9 @@ import org.apache.vysper.xmpp.stanza.IQStanzaType;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * This class handles the "unsubscribe" use cases for the "pubsub" namespace.
  * 
@@ -75,7 +78,7 @@ public class PubSubUnsubscribeHandler extends AbstractPubSubGeneralHandler {
             @SpecCompliant(spec = "xep-0060", section = "6.2.3.3", status = SpecCompliant.ComplianceStatus.FINISHED, coverage = SpecCompliant.ComplianceCoverage.COMPLETE),
             @SpecCompliant(spec = "xep-0060", section = "6.2.3.4", status = SpecCompliant.ComplianceStatus.FINISHED, coverage = SpecCompliant.ComplianceCoverage.COMPLETE),
             @SpecCompliant(spec = "xep-0060", section = "6.2.3.5", status = SpecCompliant.ComplianceStatus.FINISHED, coverage = SpecCompliant.ComplianceCoverage.COMPLETE) })
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity serverJID = serviceConfiguration.getDomainJID();
         CollectionNode root = serviceConfiguration.getRootNode();
 
@@ -93,12 +96,12 @@ public class PubSubUnsubscribeHandler extends AbstractPubSubGeneralHandler {
             subJID = EntityImpl.parse(strSubJID);
         } catch (EntityFormatException e) {
             // return error stanza... (general error)
-            return errorStanzaGenerator.generateJIDMalformedErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateJIDMalformedErrorStanza(sender, serverJID, stanza));
         }
 
         if (!sender.getBareJID().equals(subJID.getBareJID())) {
             // insufficient privileges (error condition 3 (6.2.3))
-            return errorStanzaGenerator.generateInsufficientPrivilegesErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateInsufficientPrivilegesErrorStanza(sender, serverJID, stanza));
         }
 
         String nodeName = extractNodeName(stanza);
@@ -106,28 +109,28 @@ public class PubSubUnsubscribeHandler extends AbstractPubSubGeneralHandler {
 
         if (node == null) {
             // no such node (error condition 4 (6.2.3))
-            return errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza));
         }
 
         if (strSubID == null) {
             try {
                 if (!node.unsubscribe(subJID)) {
                     // has no subscription (6.2.3.2)
-                    return errorStanzaGenerator.generateNoSuchSubscriberErrorStanza(sender, serverJID, stanza);
+                    return Collections.singletonList(errorStanzaGenerator.generateNoSuchSubscriberErrorStanza(sender, serverJID, stanza));
                 }
             } catch (MultipleSubscriptionException e) {
                 // error case 6.2.3.1
-                return errorStanzaGenerator.generateSubIDRequiredErrorStanza(sender, serverJID, stanza);
+                return Collections.singletonList(errorStanzaGenerator.generateSubIDRequiredErrorStanza(sender, serverJID, stanza));
             }
         } else {
             if (!node.unsubscribe(strSubID, subJID)) {
                 // subID not valid (6.2.3.5)
-                return errorStanzaGenerator.generateSubIDNotValidErrorStanza(sender, serverJID, stanza);
+                return Collections.singletonList(errorStanzaGenerator.generateSubIDNotValidErrorStanza(sender, serverJID, stanza));
             }
         }
 
         sb.endInnerElement(); // pubsub
-        return new IQStanza(sb.build());
+        return Collections.singletonList(new IQStanza(sb.build()));
     }
 
 }
diff --git a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java
index a5ea06b..620a9da 100644
--- a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java
+++ b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java
@@ -37,6 +37,9 @@ import org.apache.vysper.xmpp.stanza.IQStanzaType;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * This class is responsible for handling all "delete" stanzas within the pubsub#owner namespace.
  * 
@@ -70,7 +73,7 @@ public class PubSubOwnerDeleteNodeHandler extends AbstractPubSubOwnerHandler {
             @SpecCompliant(spec = "xep-0060", section = "8.4.2", status = SpecCompliant.ComplianceStatus.FINISHED, coverage = SpecCompliant.ComplianceCoverage.COMPLETE),
             @SpecCompliant(spec = "xep-0060", section = "8.4.3.1", status = SpecCompliant.ComplianceStatus.FINISHED, coverage = SpecCompliant.ComplianceCoverage.COMPLETE),
             @SpecCompliant(spec = "xep-0060", section = "8.4.3.2", status = SpecCompliant.ComplianceStatus.FINISHED, coverage = SpecCompliant.ComplianceCoverage.COMPLETE) })
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity serverJID = serviceConfiguration.getDomainJID();
         CollectionNode root = serviceConfiguration.getRootNode();
 
@@ -81,17 +84,17 @@ public class PubSubOwnerDeleteNodeHandler extends AbstractPubSubOwnerHandler {
         LeafNode node = root.find(nodeName);
 
         if (node == null) {
-            return errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza));
         }
 
         if (!node.isAuthorized(sender, PubSubPrivilege.DELETE)) {
-            return errorStanzaGenerator.generateInsufficientPrivilegesErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateInsufficientPrivilegesErrorStanza(sender, serverJID, stanza));
         }
 
         sendDeleteNotifications(serverRuntimeContext, sender, nodeName, node);
         root.deleteNode(nodeName);
 
-        return new IQStanza(sb.build());
+        return Collections.singletonList(new IQStanza(sb.build()));
     }
 
     /**
diff --git a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java
index 7c7bd70..63302fc 100644
--- a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java
+++ b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java
@@ -19,6 +19,7 @@
  */
 package org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.handler.owner;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.vysper.compliance.SpecCompliance;
@@ -81,7 +82,7 @@ public class PubSubOwnerManageAffiliationsHandler extends AbstractPubSubOwnerHan
             @SpecCompliant(spec = "xep-0060", section = "8.9.2.2", status = SpecCompliant.ComplianceStatus.NOT_STARTED, coverage = SpecCompliant.ComplianceCoverage.UNSUPPORTED),
             @SpecCompliant(spec = "xep-0060", section = "8.9.2.3.3", status = SpecCompliant.ComplianceStatus.NOT_STARTED, coverage = SpecCompliant.ComplianceCoverage.UNSUPPORTED),
             @SpecCompliant(spec = "xep-0060", section = "8.9.2.3.4", status = SpecCompliant.ComplianceStatus.NOT_STARTED, coverage = SpecCompliant.ComplianceCoverage.UNSUPPORTED) })
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity serverJID = serviceConfiguration.getDomainJID();
         CollectionNode root = serviceConfiguration.getRootNode();
 
@@ -94,18 +95,18 @@ public class PubSubOwnerManageAffiliationsHandler extends AbstractPubSubOwnerHan
         LeafNode node = root.find(nodeName);
 
         if (node == null) {
-            return errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza));
         }
 
         if (!node.isAuthorized(sender, PubSubPrivilege.MANAGE_AFFILIATIONS)) {
-            return errorStanzaGenerator.generateInsufficientPrivilegesErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateInsufficientPrivilegesErrorStanza(sender, serverJID, stanza));
         }
 
         List<AffiliationItem> affiliations = collectAllAffiliations(node);
         buildSuccessStanza(sb, node, affiliations);
 
         sb.endInnerElement();
-        return new IQStanza(sb.build());
+        return Collections.singletonList(new IQStanza(sb.build()));
     }
 
     /**
@@ -118,7 +119,7 @@ public class PubSubOwnerManageAffiliationsHandler extends AbstractPubSubOwnerHan
             @SpecCompliant(spec = "xep-0060", section = "8.9.2.2", status = SpecCompliant.ComplianceStatus.FINISHED, coverage = SpecCompliant.ComplianceCoverage.PARTIAL),
             @SpecCompliant(spec = "xep-0060", section = "8.9.2.3.3", status = SpecCompliant.ComplianceStatus.FINISHED, coverage = SpecCompliant.ComplianceCoverage.COMPLETE),
             @SpecCompliant(spec = "xep-0060", section = "8.9.2.3.4", status = SpecCompliant.ComplianceStatus.FINISHED, coverage = SpecCompliant.ComplianceCoverage.COMPLETE) })
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         Entity serverJID = serviceConfiguration.getDomainJID();
         CollectionNode root = serviceConfiguration.getRootNode();
         Entity sender = extractSenderJID(stanza, sessionContext);
@@ -130,17 +131,17 @@ public class PubSubOwnerManageAffiliationsHandler extends AbstractPubSubOwnerHan
         LeafNode node = root.find(nodeName);
 
         if (node == null) {
-            return errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateNoNodeErrorStanza(sender, serverJID, stanza));
         }
 
         if (!node.isAuthorized(sender, PubSubPrivilege.MANAGE_AFFILIATIONS)) {
-            return errorStanzaGenerator.generateInsufficientPrivilegesErrorStanza(sender, serverJID, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateInsufficientPrivilegesErrorStanza(sender, serverJID, stanza));
         }
 
         XMLElement affiliationElement = null;
         try {
             if (stanza.getFirstInnerElement().getFirstInnerElement().getInnerElements().size() != 1) {
-                return errorStanzaGenerator.generateNotAcceptableErrorStanza(serverJID, sender, stanza);
+                return Collections.singletonList(errorStanzaGenerator.generateNotAcceptableErrorStanza(serverJID, sender, stanza));
             }
 
             affiliationElement = stanza.getFirstInnerElement().getFirstInnerElement().getFirstInnerElement();
@@ -149,7 +150,7 @@ public class PubSubOwnerManageAffiliationsHandler extends AbstractPubSubOwnerHan
             try {
                 userJID = EntityImpl.parse(affiliationElement.getAttributeValue("jid"));
             } catch (EntityFormatException e) {
-                return errorStanzaGenerator.generateJIDMalformedErrorStanza(serverJID, sender, stanza); // TODO not defined in the standard(?)
+                return Collections.singletonList(errorStanzaGenerator.generateJIDMalformedErrorStanza(serverJID, sender, stanza)); // TODO not defined in the standard(?)
             }
 
             PubSubAffiliation newAffiliation = PubSubAffiliation.get(affiliationElement
@@ -157,13 +158,13 @@ public class PubSubOwnerManageAffiliationsHandler extends AbstractPubSubOwnerHan
             node.setAffiliation(userJID, newAffiliation);
         } catch (LastOwnerResignedException e) {
             // if the last owner tries to resign.
-            return errorStanzaGenerator.generateNotAcceptableErrorStanza(serverJID, sender, stanza);
+            return Collections.singletonList(errorStanzaGenerator.generateNotAcceptableErrorStanza(serverJID, sender, stanza));
         } catch (Throwable t) { // possible null-pointer
-            return errorStanzaGenerator.generateBadRequestErrorStanza(serverJID, sender, stanza); // TODO not defined in the standard(?)
+            return Collections.singletonList(errorStanzaGenerator.generateBadRequestErrorStanza(serverJID, sender, stanza)); // TODO not defined in the standard(?)
         }
 
         sb.endInnerElement();
-        return new IQStanza(sb.build());
+        return Collections.singletonList(new IQStanza(sb.build()));
     }
 
     /**
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java
index d9f2e8e..aed786a 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java
@@ -55,7 +55,7 @@ public class PubSubDiscoInfoTestCase extends AbstractPublishSubscribeTestCase {
 
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
 
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
 
@@ -99,7 +99,7 @@ public class PubSubDiscoInfoTestCase extends AbstractPublishSubscribeTestCase {
 
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
 
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
 
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
index be6ca65..82af51e 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
@@ -55,7 +55,7 @@ public class PubSubDiscoItemsTestCase extends AbstractPublishSubscribeTestCase {
 
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
 
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
 
@@ -80,7 +80,7 @@ public class PubSubDiscoItemsTestCase extends AbstractPublishSubscribeTestCase {
 
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
 
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
 
@@ -123,7 +123,7 @@ public class PubSubDiscoItemsTestCase extends AbstractPublishSubscribeTestCase {
 
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
 
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
 
@@ -159,7 +159,7 @@ public class PubSubDiscoItemsTestCase extends AbstractPublishSubscribeTestCase {
 
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
 
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
 
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java
index 384af03..60c2dcd 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java
@@ -74,7 +74,7 @@ public class PubSubCreateNodeTestCase extends AbstractPublishSubscribeTestCase {
         Stanza stanza = sg.getStanza(client, pubsubService, "id123", testNode);
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
 
         assertEquals("id123", response.getAttributeValue("id")); // IDs must match
@@ -92,7 +92,7 @@ public class PubSubCreateNodeTestCase extends AbstractPublishSubscribeTestCase {
         Stanza stanza = sg.getStanza(client, pubsubService, "id123", testNode);
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertEquals("id123", response.getAttributeValue("id")); // IDs must match
 
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
index 5c66ce5..603cfec 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
@@ -63,7 +63,7 @@ public class PubSubPublishTestCase extends AbstractPublishSubscribeTestCase {
         node.subscribe("id", client);
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubService, "id123", "news"), true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
 
         assertEquals("id123", response.getAttributeValue("id")); // IDs must match
@@ -100,7 +100,7 @@ public class PubSubPublishTestCase extends AbstractPublishSubscribeTestCase {
         // verify response
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
 
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
 
@@ -128,7 +128,7 @@ public class PubSubPublishTestCase extends AbstractPublishSubscribeTestCase {
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubWrongNode, "id123", "doesnotexist"),
                 true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertFalse(node.isSubscribed(client));
 
@@ -151,7 +151,7 @@ public class PubSubPublishTestCase extends AbstractPublishSubscribeTestCase {
         ResponseStanzaContainer result = sendStanza(sg.getStanza(yodaNotSubscribed, pubsubService, "id123", "news"),
                 true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertFalse(node.isSubscribed(client));
         assertEquals(0, node.countSubscriptions(client));
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsTestCase.java
index 23a41c7..e83ae80 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsTestCase.java
@@ -74,7 +74,7 @@ public class PubSubRetrieveAffiliationsTestCase extends AbstractPublishSubscribe
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         XMLElement sub = response.getFirstInnerElement().getFirstInnerElement();
         assertEquals("affiliations", sub.getName());
@@ -89,7 +89,7 @@ public class PubSubRetrieveAffiliationsTestCase extends AbstractPublishSubscribe
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         XMLElement sub = response.getFirstInnerElement().getFirstInnerElement();
         assertEquals("affiliations", sub.getName());
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsTestCase.java
index 8095c0e..4e250ad 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsTestCase.java
@@ -71,7 +71,7 @@ public class PubSubRetrieveSubscriptionsTestCase extends AbstractPublishSubscrib
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         XMLElement sub = response.getFirstInnerElement().getFirstInnerElement();
         assertEquals("subscriptions", sub.getName());
@@ -91,7 +91,7 @@ public class PubSubRetrieveSubscriptionsTestCase extends AbstractPublishSubscrib
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         XMLElement sub = response.getFirstInnerElement().getFirstInnerElement();
         assertEquals("subscriptions", sub.getName());
@@ -111,7 +111,7 @@ public class PubSubRetrieveSubscriptionsTestCase extends AbstractPublishSubscrib
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         XMLElement sub = response.getFirstInnerElement().getFirstInnerElement();
         assertEquals("subscriptions", sub.getName());
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
index da1b848..c8cacb6 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
@@ -64,7 +64,7 @@ public class PubSubSubscribeTestCase extends AbstractPublishSubscribeTestCase {
         Stanza stanza = sg.getStanza(client, pubsubService, "id123", testNode);
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         assertTrue(node.isSubscribed(client));
 
@@ -87,7 +87,7 @@ public class PubSubSubscribeTestCase extends AbstractPublishSubscribeTestCase {
         Stanza stanza = sg.getStanza(null, pubsubService, "id123", testNode);
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         assertTrue(node.isSubscribed(client));
 
@@ -109,7 +109,7 @@ public class PubSubSubscribeTestCase extends AbstractPublishSubscribeTestCase {
 
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubService, "id123", testNode), true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertFalse(node.isSubscribed(client));
 
@@ -134,7 +134,7 @@ public class PubSubSubscribeTestCase extends AbstractPublishSubscribeTestCase {
 
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubService, "id123", testNode), true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertFalse(node.isSubscribed(client));
 
@@ -157,7 +157,7 @@ public class PubSubSubscribeTestCase extends AbstractPublishSubscribeTestCase {
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubWrongNode, "id123", "doesnotexist"),
                 true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertFalse(node.isSubscribed(client));
 
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
index fe5e21b..35a3e38 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
@@ -119,7 +119,7 @@ public class PubSubUnsubscribeTestCase extends AbstractPublishSubscribeTestCase
 
         // check subscription and response stanza
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         assertFalse(node.isSubscribed(client));
     }
@@ -133,7 +133,7 @@ public class PubSubUnsubscribeTestCase extends AbstractPublishSubscribeTestCase
 
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubService, "id123", "news"), true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertTrue(node.isSubscribed(client));
         assertEquals(2, node.countSubscriptions(client));
@@ -159,7 +159,7 @@ public class PubSubUnsubscribeTestCase extends AbstractPublishSubscribeTestCase
         assertFalse(node.isSubscribed(client));
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubService, "id123", "news"), true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertFalse(node.isSubscribed(client));
         assertEquals(0, node.countSubscriptions(client));
@@ -188,7 +188,7 @@ public class PubSubUnsubscribeTestCase extends AbstractPublishSubscribeTestCase
 
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubService, "id123", "news"), true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertFalse(node.isSubscribed(client));
         assertEquals(0, node.countSubscriptions(client));
@@ -212,7 +212,7 @@ public class PubSubUnsubscribeTestCase extends AbstractPublishSubscribeTestCase
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubWrongNode, "id123", "doesnotexsist"),
                 true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertFalse(node.isSubscribed(client));
 
@@ -238,7 +238,7 @@ public class PubSubUnsubscribeTestCase extends AbstractPublishSubscribeTestCase
 
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubService, "id123", "news"), true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertTrue(node.isSubscribed(client));
         assertEquals(2, node.countSubscriptions(client)); // still 2 subscriptions
@@ -264,7 +264,7 @@ public class PubSubUnsubscribeTestCase extends AbstractPublishSubscribeTestCase
 
         ResponseStanzaContainer result = sendStanza(sg.getStanza(client, pubsubService, "id123", "news"), true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
         assertFalse(node.isSubscribed(client));
 
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java
index cf21771..5d7cb0f 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java
@@ -88,7 +88,7 @@ public class PubSubDeleteNodeTestCase extends AbstractPublishSubscribeTestCase {
         Stanza stanza = sg.getStanza(client, pubsubService, "id123", testNode);
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
 
         assertEquals("id123", response.getAttributeValue("id")); // IDs must match
@@ -111,7 +111,7 @@ public class PubSubDeleteNodeTestCase extends AbstractPublishSubscribeTestCase {
         Stanza stanza = sg.getStanza(clientNotAuthorized, pubsubService, "id123", testNode);
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
 
         assertEquals("id123", response.getAttributeValue("id")); // IDs must match
@@ -137,7 +137,7 @@ public class PubSubDeleteNodeTestCase extends AbstractPublishSubscribeTestCase {
         Stanza stanza = sg.getStanza(client, pubsubService, "id123", testNode);
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
 
         assertEquals("id123", response.getAttributeValue("id")); // IDs must match
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerModifyAffiliationsTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerModifyAffiliationsTestCase.java
index ecaf54a..efe5502 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerModifyAffiliationsTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerModifyAffiliationsTestCase.java
@@ -78,7 +78,7 @@ public class PubSubOwnerModifyAffiliationsTestCase extends AbstractPublishSubscr
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
 
         assertEquals("id123", response.getAttributeValue("id")); // IDs must match
@@ -102,7 +102,7 @@ public class PubSubOwnerModifyAffiliationsTestCase extends AbstractPublishSubscr
         Stanza stanza = sg.getStanza(client, pubsubService, "id123", testNode);
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
 
         assertEquals("id123", response.getAttributeValue("id")); // IDs must match
@@ -129,7 +129,7 @@ public class PubSubOwnerModifyAffiliationsTestCase extends AbstractPublishSubscr
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         assertEquals("4711", response.getAttributeValue("id")); // IDs must match
 
@@ -151,7 +151,7 @@ public class PubSubOwnerModifyAffiliationsTestCase extends AbstractPublishSubscr
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         assertEquals("4711", response.getAttributeValue("id")); // IDs must match
 
@@ -173,7 +173,7 @@ public class PubSubOwnerModifyAffiliationsTestCase extends AbstractPublishSubscr
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
 
         assertEquals("4711", response.getAttributeValue("id")); // IDs must match
diff --git a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerRetrieveAffiliationsTestCase.java b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerRetrieveAffiliationsTestCase.java
index a9aacf1..12eaad0 100644
--- a/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerRetrieveAffiliationsTestCase.java
+++ b/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerRetrieveAffiliationsTestCase.java
@@ -74,7 +74,7 @@ public class PubSubOwnerRetrieveAffiliationsTestCase extends AbstractPublishSubs
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
 
         assertEquals("id123", response.getAttributeValue("id")); // IDs must match
@@ -97,7 +97,7 @@ public class PubSubOwnerRetrieveAffiliationsTestCase extends AbstractPublishSubs
         Stanza stanza = sg.getStanza(client, pubsubService, "id123", testNode);
         ResponseStanzaContainer result = sendStanza(stanza, true);
         assertTrue(result.hasResponse());
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.ERROR.value(), response.getType());
 
         assertEquals("id123", response.getAttributeValue("id")); // IDs must match
@@ -120,7 +120,7 @@ public class PubSubOwnerRetrieveAffiliationsTestCase extends AbstractPublishSubs
 
         assertTrue(result.hasResponse());
 
-        IQStanza response = new IQStanza(result.getResponseStanza());
+        IQStanza response = new IQStanza(result.getUniqueResponseStanza());
         assertEquals(IQStanzaType.RESULT.value(), response.getType());
         XMLElement sub = response.getFirstInnerElement().getFirstInnerElement();
         assertEquals("affiliations", sub.getName());
diff --git a/server/extensions/xep0065-socks/src/main/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IqHandler.java b/server/extensions/xep0065-socks/src/main/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IqHandler.java
index 56d498a..75e342c 100644
--- a/server/extensions/xep0065-socks/src/main/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IqHandler.java
+++ b/server/extensions/xep0065-socks/src/main/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IqHandler.java
@@ -22,6 +22,8 @@ package org.apache.vysper.xmpp.extension.xep0065_socks;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.List;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.vysper.xml.fragment.XMLElement;
@@ -75,7 +77,7 @@ public class Socks5IqHandler extends DefaultIQHandler {
     }
 
     @Override
-    protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         /*
             C: <iq from='requester@example.com/foo'
                     id='uj2c15z9'
@@ -110,11 +112,11 @@ public class Socks5IqHandler extends DefaultIQHandler {
         builder.addAttribute("jid", jid.getFullQualifiedName())
             .addAttribute("port", Integer.toString(proxyAddress.getPort()));
         
-        return builder.build();
+        return Collections.singletonList(builder.build());
     }
 
     @Override
-    protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
+    protected List<Stanza> handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
         /*
             C: <iq from='requester@example.com/foo'
                     id='oqx6t1c9'
@@ -149,12 +151,12 @@ public class Socks5IqHandler extends DefaultIQHandler {
             
             if(connections.activate(hash)) {
                 Stanza result = StanzaBuilder.createIQStanza(jid, requester, IQStanzaType.RESULT, stanza.getID()).build();
-                return result;
+                return Collections.singletonList(result);
             } else {
                 throw new RuntimeException("Pair not found");
             }
         } catch(Exception e) {
-            return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza, StanzaErrorType.CANCEL, null, null, null);
+            return Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza, StanzaErrorType.CANCEL, null, null, null));
         }
     }
 }
diff --git a/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IqHandlerTest.java b/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IqHandlerTest.java
index 9ed988d..55a1f6d 100644
--- a/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IqHandlerTest.java
+++ b/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IqHandlerTest.java
@@ -20,6 +20,7 @@
 package org.apache.vysper.xmpp.extension.xep0065_socks;
 
 import java.net.InetSocketAddress;
+import java.util.List;
 
 import junit.framework.Assert;
 
@@ -28,6 +29,7 @@ import org.apache.vysper.xml.fragment.XMLSemanticError;
 import org.apache.vysper.xmpp.addressing.Entity;
 import org.apache.vysper.xmpp.addressing.EntityImpl;
 import org.apache.vysper.xmpp.protocol.NamespaceURIs;
+import org.apache.vysper.xmpp.protocol.ResponseStanzaContainerImpl;
 import org.apache.vysper.xmpp.server.ServerRuntimeContext;
 import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.stanza.IQStanza;
@@ -131,7 +133,8 @@ public class Socks5IqHandlerTest extends Mockito {
 
     @Test
     public void handleGet() throws BindException, XMLSemanticError {
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(stanza.getTo(), stanza.getFrom(), IQStanzaType.RESULT, stanza.getID())
             .startInnerElement("query", NamespaceURIs.XEP0065_SOCKS5_BYTESTREAMS)
@@ -148,7 +151,8 @@ public class Socks5IqHandlerTest extends Mockito {
     public void handleGetDefaultAddress() throws BindException, XMLSemanticError {
         proxyAddress = new InetSocketAddress(12345);
         handler = new Socks5IqHandler(jid, proxyAddress, connectionsRegistry);
-        Stanza response = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleGet(stanza, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(stanza.getTo(), stanza.getFrom(), IQStanzaType.RESULT, stanza.getID())
         .startInnerElement("query", NamespaceURIs.XEP0065_SOCKS5_BYTESTREAMS)
@@ -175,7 +179,8 @@ public class Socks5IqHandlerTest extends Mockito {
         String hash = DigestUtils.shaHex("sid1" + FROM.getFullQualifiedName() + TARGET.getFullQualifiedName());
         when(connectionsRegistry.activate(hash)).thenReturn(true);
         
-        Stanza response = handler.handleSet(request, serverRuntimeContext, sessionContext);
+        List<Stanza> responses = handler.handleSet(request, serverRuntimeContext, sessionContext);
+        Stanza response = new ResponseStanzaContainerImpl(responses).getUniqueResponseStanza();
         
         Stanza expected = StanzaBuilder.createIQStanza(TO, FROM, IQStanzaType.RESULT, "id1")
             .build();