diff --git a/event-handler/index.js b/event-handler/index.js
index 9b94cdc3c..81d8042fc 100644
--- a/event-handler/index.js
+++ b/event-handler/index.js
@@ -29,20 +29,24 @@ class EventHandler {
   getEventHandlerStatus() {
     return {
       isEnabled: true,
-      maxNumEventChannels: NodeConfigs.MAX_NUM_EVENT_CHANNELS,
-      numEventChannels: this.eventChannelManager.getNumEventChannels(),
-      maxNumEventFilters: NodeConfigs.MAX_NUM_EVENT_FILTERS,
-      numEventFilters: this.getNumEventFilters(),
+      networkInfo: this.eventChannelManager.getNetworkInfo(),
+      filterInfo: this.getFilterInfo(),
+      channelInfo: this.eventChannelManager.getChannelInfo(),
     };
   }
 
   static getDefaultEventHandlerStatus() {
     return {
       isEnabled: false,
-      maxNumEventChannels: NodeConfigs.MAX_NUM_EVENT_CHANNELS,
-      numEventChannels: 0,
-      maxNumEventFilters: NodeConfigs.MAX_NUM_EVENT_FILTERS,
-      numEventFilters: 0,
+      networkInfo: {
+        url: "",
+        maxNumEventChannels: NodeConfigs.MAX_NUM_EVENT_CHANNELS,
+        numEventChannels: 0,
+        maxNumEventFilters: NodeConfigs.MAX_NUM_EVENT_FILTERS,
+        numEventFilters: 0,
+      },
+      filterInfo: {},
+      channelInfo: {},
     };
   }
 
diff --git a/test/unit/p2p.test.js b/test/unit/p2p.test.js
index b9a6a224a..a17b6a82c 100644
--- a/test/unit/p2p.test.js
+++ b/test/unit/p2p.test.js
@@ -225,10 +225,17 @@ describe("P2p", () => {
           },
           eventHandlerStatus: {
             isEnabled: false,
-            maxNumEventChannels: 10,
-            maxNumEventFilters: 20,
-            numEventChannels: 0,
-            numEventFilters: 0,
+            networkInfo: {
+              url: "",
+              maxNumEventChannels: 10,
+              numEventChannels: 0,
+              maxNumEventFilters: 20,
+              numEventFilters: 0,
+            },
+            filterInfo: {
+            },
+            channelInfo: {
+            },
           }
         });
       });