diff --git a/brian_dashboard_manager/templating/gws.py b/brian_dashboard_manager/templating/gws.py
index 7677f8ec09e32fa1de3cca312b607ec3e4a34930..dd8a49b35ade68d88b3a0441fed4336e9636f666 100644
--- a/brian_dashboard_manager/templating/gws.py
+++ b/brian_dashboard_manager/templating/gws.py
@@ -1,9 +1,9 @@
-from typing import DefaultDict
+from typing import Dict, List
 from brian_dashboard_manager.templating.helpers import get_dashboard_data
 
 
 def get_panel_data(interfaces):
-    result = DefaultDict(list)
+    result: Dict[str, List[Dict]] = {}
 
     count = {}
 
@@ -41,7 +41,7 @@ def get_panel_data(interfaces):
 
         gws_measurement = 'gwsd_rates'
         title = f'{nren} GWS Direct {isp} Interface {if_num} ({hostname})'
-        result[f'GWS Direct - {isp}'].append({
+        result.setdefault(f'GWS Direct - {isp}', []).append({
             'isp': isp,
             'nren': nren,
             'measurement': gws_measurement,
@@ -54,7 +54,7 @@ def get_panel_data(interfaces):
 
 
 def get_gws_indirect_panel_data(interfaces):
-    result = DefaultDict(list)
+    result: Dict[str, List[Dict]] = {}
 
     for interface in interfaces:
 
@@ -65,7 +65,7 @@ def get_gws_indirect_panel_data(interfaces):
 
         measurement = 'dscp32_rates'
         panel_title = f'{hostname} - {{}} - {if_name} - #{service_name} IASGWS'
-        result[f'GWS Indirect - {customer}'].append({
+        result.setdefault(f'GWS Indirect - {customer}', []).append({
             'measurement': measurement,
             'title': panel_title,
             'interface': if_name,