diff --git a/.gitmodules b/.gitmodules
index b58b195..78a158d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "src/backend"]
 	path = src/backend
-	url = https://github.com/communi/libcommuni.git
+	url = https://github.com/mornfall/libcommuni
 [submodule "src/shared"]
 	path = src/shared
-	url = https://github.com/communi/communi-shared.git
\ No newline at end of file
+	url = https://github.com/communi/communi-shared.git
diff --git a/src/app/bufferproxymodel.cpp b/src/app/bufferproxymodel.cpp
index 6c6c5c1..40755f9 100644
--- a/src/app/bufferproxymodel.cpp
+++ b/src/app/bufferproxymodel.cpp
@@ -36,6 +36,7 @@
 #include <IrcBufferModel>
 #include <IrcConnection>
 #include <IrcBuffer>
+#include <IrcLagTimer>
 
 IRC_USE_NAMESPACE
 
@@ -147,6 +148,8 @@ void BufferProxyModel::addConnection(IrcConnection* connection)
 
 void BufferProxyModel::insertConnection(int index, IrcConnection* connection)
 {
+    connection->network()->setRequestedCapabilities(Irc::supportedCapabilities());
+
     IrcBufferModel* model = new IrcBufferModel(connection);
     model->setSortMethod(static_cast<Irc::SortMethod>(m_method));
     connect(model, &IrcBufferModel::added, this, &BufferProxyModel::bufferAdded);
@@ -154,6 +157,9 @@ void BufferProxyModel::insertConnection(int index, IrcConnection* connection)
     connect(model, &IrcBufferModel::aboutToBeAdded, this, &BufferProxyModel::bufferAboutToBeAdded);
     connect(model, &IrcBufferModel::aboutToBeRemoved, this, &BufferProxyModel::bufferAboutToBeRemoved);
 
+    IrcLagTimer* lag = new IrcLagTimer(model);
+    lag->setConnection(connection, true);
+
     ZncManager* znc = new ZncManager(model);
     znc->setModel(model);
 
diff --git a/src/backend b/src/backend
index d1625e5..13b6a84 160000
--- a/src/backend
+++ b/src/backend
@@ -1 +1 @@
-Subproject commit d1625e5d667503df3ee2ddd156f2ad6d7ed3f1a2
+Subproject commit 13b6a84a1212e6a39b042d83f31ffdddabf71500