diff --git a/Borepin.sln b/Borepin.sln
index 01728c9..922d82c 100644
--- a/Borepin.sln
+++ b/Borepin.sln
@@ -31,6 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		.gitlab-ci.yml = .gitlab-ci.yml
+		.gitmodules = .gitmodules
 	EndProjectSection
 EndProject
 Global
diff --git a/Borepin/Borepin/Service/BFFH/BFFHService.cs b/Borepin/Borepin/Service/BFFH/BFFHService.cs
index 5e767cd..c7a79d1 100644
--- a/Borepin/Borepin/Service/BFFH/BFFHService.cs
+++ b/Borepin/Borepin/Service/BFFH/BFFHService.cs
@@ -8,6 +8,7 @@ using Borepin.Service.Storage;
 using Borepin.Model.Storage;
 using Borepin.Service.BFFH.Exceptions;
 using Borepin.Service.Storage.Exceptions;
+using Capnp.Rpc;
 
 namespace Borepin.Service.BFFH
 {
@@ -60,6 +61,11 @@ namespace Borepin.Service.BFFH
         #endregion
 
         #region Methods
+        private void StateChanged(Object sender, ConnectionStateEventArgs e)
+        {
+            
+        }
+
         /// <summary>
         /// Get all known Connections from Storage
         /// </summary>
@@ -297,9 +303,10 @@ namespace Borepin.Service.BFFH
         #endregion
 
         #region Private Methods
-        private static async Task<Capnp.Rpc.TcpRpcClient> _ConnectAsync(string host, int port)
+        private async Task<TcpRpcClient> _ConnectAsync(string host, int port)
         {
-            Capnp.Rpc.TcpRpcClient rpcClient = new Capnp.Rpc.TcpRpcClient();
+            TcpRpcClient rpcClient = new TcpRpcClient();
+            rpcClient.ConnectionStateChanged += StateChanged;
             rpcClient.Connect(host, port);
             await rpcClient.WhenConnected.ConfigureAwait(false);
 
diff --git a/external/capnproto-dotnetcore b/external/capnproto-dotnetcore
index 1ba1b6f..086bbc2 160000
--- a/external/capnproto-dotnetcore
+++ b/external/capnproto-dotnetcore
@@ -1 +1 @@
-Subproject commit 1ba1b6fbe0d9a278445ef7fde7624f218171156b
+Subproject commit 086bbc2497785d2cc63e9252df6f6d3ee7599579