diff --git a/bumper/__init__.py b/bumper/__init__.py
index dc90528..bc1f821 100644
--- a/bumper/__init__.py
+++ b/bumper/__init__.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+from typing import Optional
 
 from bumper.confserver import ConfServer
 from bumper.mqttserver import MQTTServer, MQTTHelperBot
@@ -60,11 +61,11 @@ token_validity_seconds = 3600  # 1 hour
 oauth_validity_days = 15
 db = None
 
-mqtt_server = None
-mqtt_helperbot = None
-conf_server = None
-conf_server_2 = None
-xmpp_server = None
+mqtt_server: Optional[MQTTServer] = None
+mqtt_helperbot: Optional[MQTTHelperBot] = None
+conf_server: Optional[ConfServer] = None
+conf_server_2: Optional[ConfServer] = None
+xmpp_server: Optional[XMPPServer] = None
 
 # Plugins
 sys.path.append(os.path.join(bumper_dir, "bumper", "plugins"))
diff --git a/bumper/mqttserver.py b/bumper/mqttserver.py
index f53d1f8..b2fa69b 100644
--- a/bumper/mqttserver.py
+++ b/bumper/mqttserver.py
@@ -22,8 +22,7 @@ mqttserverlog = logging.getLogger("mqttserver")
 class MQTTHelperBot:
 
     Client = None
-    wait_resp_timeout_seconds = 10
-    expire_msg_seconds = 10
+    wait_resp_timeout_seconds = 60
 
     def __init__(self, address):
         self.address = address
@@ -150,7 +149,7 @@ class MQTTServer:
 
         mqttserverlog.info(
             "Starting MQTT Server at {}:{}".format(self.address[0], self.address[1])
-        )        
+        )
 
         try:
             await self.broker.start()
@@ -177,9 +176,9 @@ class MQTTServer:
             allow_anon = False
 
             for key, value in kwargs.items():
-                if key == "password_file":            
+                if key == "password_file":
                     passwd_file = kwargs["password_file"]
-                
+
                 elif key == "allow_anonymous":
                     allow_anon = kwargs["allow_anonymous"] # Set to True to allow anonymous authentication
 
@@ -204,7 +203,7 @@ class MQTTServer:
                 },
                 "sys_interval": 0,
                 "auth": {
-                    "allow-anonymous": allow_anon, 
+                    "allow-anonymous": allow_anon,
                     "password-file": passwd_file,
                     "plugins": ["bumper"],  # Bumper plugin provides auth and handling of bots/clients connecting
                 },
@@ -234,7 +233,7 @@ class BumperMQTTServer_Plugin:
 
     async def authenticate(self, *args, **kwargs):
         authenticated = False
-        
+
         try:
             session = kwargs.get("session", None)
             username = session.username
@@ -254,7 +253,7 @@ class BumperMQTTServer_Plugin:
                         tmpbotdetail[1],
                         "eco-ng",
                     )
-                    mqttserverlog.info(f"Bumper Authentication Success - Bot - SN: {username} - DID: {didsplit[0]} - Class: {tmpbotdetail[0]}")                    
+                    mqttserverlog.info(f"Bumper Authentication Success - Bot - SN: {username} - DID: {didsplit[0]} - Class: {tmpbotdetail[0]}")
                     authenticated = True
 
                 else:
@@ -302,7 +301,7 @@ class BumperMQTTServer_Plugin:
         # Check for allow anonymous
         allow_anonymous = self.auth_config.get(
             "allow-anonymous", True
-        )  
+        )
         if allow_anonymous and not authenticated: # If anonymous auth is allowed and it isn't already authenticated
             authenticated = True
             self.context.logger.debug(f"Anonymous Authentication Success: config allows anonymous - Username: {username}")
@@ -344,7 +343,7 @@ class BumperMQTTServer_Plugin:
 
     async def on_broker_message_received(self, client_id, message):
         self.handle_helperbot_msg(client_id, message)
-        
+
     def handle_helperbot_msg(self, client_id, message):
 
             if str(message.topic).split("/")[6] == "helperbot":
@@ -394,7 +393,7 @@ class BumperMQTTServer_Plugin:
             for msg in bumper.mqtt_helperbot.command_responses:
                 expire_time = (
                     datetime.fromtimestamp(msg["time"])
-                    + timedelta(seconds=bumper.mqtt_helperbot.expire_msg_seconds)
+                    + timedelta(seconds=MQTTHelperBot.wait_resp_timeout_seconds)
                 ).timestamp()
                 if time.time() > expire_time:
                     helperbotlog.debug(