diff --git a/modules/modpython/modpython.i b/modules/modpython/modpython.i
index d98c4620..d3d98d40 100644
--- a/modules/modpython/modpython.i
+++ b/modules/modpython/modpython.i
@@ -27,6 +27,7 @@
 #include "znc/Chan.h"
 #include "znc/User.h"
 #include "znc/IRCNetwork.h"
+#include "znc/Query.h"
 #include "znc/Client.h"
 #include "znc/IRCSock.h"
 #include "znc/Listener.h"
@@ -105,6 +106,8 @@ class MCString : public std::map<CString, CString> {};
 %template(BufLines) std::deque<CBufLine>;
 %template(VVString) std::vector<VCString>;
 %template(VClients) std::vector<CClient*>;
+%template(VServers) std::vector<CServer*>;
+%template(VQueries) std::vector<CQuery*>;
 
 #define REGISTER_ZNC_MESSAGE(M) \
     %template(As_ ## M) CMessage::As<M>;
@@ -163,6 +166,7 @@ class MCString : public std::map<CString, CString> {};
 %include "znc/Chan.h"
 %include "znc/User.h"
 %include "znc/IRCNetwork.h"
+%include "znc/Query.h"
 %include "znc/Client.h"
 %include "znc/IRCSock.h"
 %include "znc/Listener.h"
@@ -273,6 +277,12 @@ class CPyRetBool {
 	std::vector<CChan*> GetChans_() {
 		return $self->GetChans();
 	}
+	std::vector<CServer*> GetServers_() {
+		return $self->GetServers();
+	}
+	std::vector<CQuery*> GetQueries_() {
+		return $self->GetQueries();
+	}
 }
 
 %extend CChan {
diff --git a/modules/modpython/znc.py b/modules/modpython/znc.py
index 8e4d20e3..a8a2bbb9 100644
--- a/modules/modpython/znc.py
+++ b/modules/modpython/znc.py
@@ -921,6 +921,8 @@ def CreateWebSubPage(name, title='', params=dict(), admin=False):
 
 CUser.GetNetworks = CUser.GetNetworks_
 CIRCNetwork.GetChans = CIRCNetwork.GetChans_
+CIRCNetwork.GetServers = CIRCNetwork.GetServers_
+CIRCNetwork.GetQueries = CIRCNetwork.GetQueries_
 CChan.GetNicks = CChan.GetNicks_
 CZNC.GetUserMap = CZNC.GetUserMap_