diff --git a/src/HaritoraX.ts b/src/HaritoraX.ts
index b51f861..f68052b 100644
--- a/src/HaritoraX.ts
+++ b/src/HaritoraX.ts
@@ -252,6 +252,8 @@ let trackerModelEnabled: string;
  * @event this#connect
  * @type {string}
  * @property {string} trackerName - The name of the tracker.
+ * @property {string} connectionMode - The connection mode the tracker is using - useful if multiple connection modes are used.
+ * @property {string} port - The COM port used the tracker is using (COM only)
  **/
 
 /**
@@ -956,7 +958,7 @@ function listenToDeviceEvents() {
             const trackerName = peripheral.advertisement.localName;
             if (trackerName && !activeDevices.includes(trackerName)) {
                 activeDevices.push(trackerName);
-                main.emit("connect", trackerName);
+                main.emit("connect", trackerName, "bluetooth");
             }
         });
 
@@ -1059,9 +1061,15 @@ function processIMUData(data: Buffer, trackerName: string, ankleValue?: number)
 
     // If tracker isn't in activeDevices, add it and emit "connect" event
     if (trackerName && !activeDevices.includes(trackerName) && (comEnabled || bluetoothEnabled)) {
-        log(`Tracker ${trackerName} isn't in active devices, adding and emitting connect event`);
+        console.log(`Tracker ${trackerName} isn't in active devices, adding and emitting connect event`);
+        
+        const mode = isWirelessBT(trackerName) ? "bluetooth" : "com";
+        const port = isWirelessBT(trackerName) ? undefined : com.getTrackerPort(trackerName);
+
+        console.log(`Tracker ${trackerName} mode: ${mode}, port: ${port}`);
+        
         activeDevices.push(trackerName);
-        main.emit("connect", trackerName);
+        main.emit("connect", trackerName, mode, port);
     }
 
     // Decode and log the data
diff --git a/src/mode/bluetooth.ts b/src/mode/bluetooth.ts
index de92baa..1bf9665 100644
--- a/src/mode/bluetooth.ts
+++ b/src/mode/bluetooth.ts
@@ -55,7 +55,6 @@ let allowReconnect = true;
 export default class Bluetooth extends EventEmitter {
     constructor() {
         super();
-        this.setMaxListeners(1); // Prevent memory leaks
         noble.on("discover", this.onDiscover.bind(this));
         main = this;
         log(`Initialized Bluetooth module.`);
diff --git a/src/mode/com.ts b/src/mode/com.ts
index 8b81cea..8b22c1b 100644
--- a/src/mode/com.ts
+++ b/src/mode/com.ts
@@ -57,7 +57,6 @@ let heartbeatInterval: number; // in milliseconds
 export default class COM extends EventEmitter {
     constructor(trackerModel: string, heartbeat?: number) {
         super();
-        this.setMaxListeners(1); // Prevent memory leaks
         main = this;
         trackerModelEnabled = trackerModel;
         heartbeatInterval = heartbeat;