diff --git a/gajim/common/modules/gateway.py b/gajim/common/modules/gateway.py
index 57a1d7ada..c76d3d835 100644
--- a/gajim/common/modules/gateway.py
+++ b/gajim/common/modules/gateway.py
@@ -93,3 +93,7 @@ class Gateway:
                          prompt=prompt,
                          prompt_jid=prompt_jid,
                          stanza=stanza))
+
+
+def get_instance(*args, **kwargs):
+    return Gateway(*args, **kwargs), 'Gateway'
diff --git a/gajim/common/modules/iq.py b/gajim/common/modules/iq.py
index c8e743e4d..5d2adde76 100644
--- a/gajim/common/modules/iq.py
+++ b/gajim/common/modules/iq.py
@@ -85,3 +85,7 @@ class Iq:
         if len(id_) > 3 and id_[2] == '_':
             sid = id_[3:]
         return sid
+
+
+def get_instance(*args, **kwargs):
+    return Iq(*args, **kwargs), 'Iq'