diff --git a/debian/changelog b/debian/changelog
index ac6d0a5..6e24020 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-protonvpn-cli (3.1.0-10) UNRELEASED; urgency=low
+protonvpn-cli (3.1.0-11) UNRELEASED; urgency=low
 
   * Add support for protonvpn-nm-lib v0.2.0-1
   * Cache servers after connecting to vpn if previous cache failed
@@ -10,7 +10,7 @@ protonvpn-cli (3.1.0-10) UNRELEASED; urgency=low
   * Bugfix: Catch KeyringError
   * Bugfix: Cache prior displays connection status; incorrect cache when using dialog
 
- -- Proton Technologies AG <opensource@proton.me>  Fri, 04 Dec 2020 17:0:22 +0000
+ -- Proton Technologies AG <opensource@proton.me>  Mond, 14 Dec 2020 11:25:18 +0000
 
 protonvpn-cli (3.0.0-10) UNRELEASED; urgency=low
 
diff --git a/protonvpn_cli/cli_wrapper.py b/protonvpn_cli/cli_wrapper.py
index 158e433..e846c48 100644
--- a/protonvpn_cli/cli_wrapper.py
+++ b/protonvpn_cli/cli_wrapper.py
@@ -48,29 +48,11 @@ class CLIWrapper():
         + "----------------"
         + "------------"
     )
-    time_sleep_value = 1
-    reconector_manager = ReconnectorManager()
-    user_conf_manager = UserConfigurationManager()
-    ks_manager = KillSwitchManager(user_conf_manager)
-    connection_manager = ConnectionManager()
-    user_manager = UserManager()
-    server_manager = ServerManager(CertificateManager(), user_manager)
-    ipv6_lp_manager = IPv6LeakProtectionManager()
-    protonvpn_dialog = ProtonVPNDialog(server_manager, user_manager)
-    CLI_COMMAND_DICT = dict(
-        servername=server_manager.direct,
-        fastest=server_manager.fastest,
-        random=server_manager.random_c,
-        cc=server_manager.country_f,
-        sc=server_manager.feature_f,
-        p2p=server_manager.feature_f,
-        tor=server_manager.feature_f,
-    )
 
     def __init__(self):
         if "SUDO_UID" in os.environ:
             print(
-                "\nRunning ProtonVPN as root is not indended and "
+                "\nRunning ProtonVPN as root is not supported and "
                 "is highly discouraged, as it might introduce "
                 "undesirable side-effects."
             )
@@ -79,6 +61,29 @@ def __init__(self):
             if not user_input == "y":
                 sys.exit(1)
 
+        self.time_sleep_value = 1
+        self.reconector_manager = ReconnectorManager()
+        self.user_conf_manager = UserConfigurationManager()
+        self.ks_manager = KillSwitchManager(self.user_conf_manager)
+        self.connection_manager = ConnectionManager()
+        self.user_manager = UserManager()
+        self.server_manager = ServerManager(
+            CertificateManager(), self.user_manager
+        )
+        self.ipv6_lp_manager = IPv6LeakProtectionManager()
+        self.protonvpn_dialog = ProtonVPNDialog(
+            self.server_manager, self.user_manager
+        )
+        self.CLI_COMMAND_DICT = dict(
+            servername=self.server_manager.direct,
+            fastest=self.server_manager.fastest,
+            random=self.server_manager.random_c,
+            cc=self.server_manager.country_f,
+            sc=self.server_manager.feature_f,
+            p2p=self.server_manager.feature_f,
+            tor=self.server_manager.feature_f,
+        )
+
     def connect(self, args):
         """Proxymethod to connect to ProtonVPN."""