diff --git a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/beats_config.py b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/beats_config.py
index 0409f5a46..80faeaff3 100644
--- a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/beats_config.py
+++ b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/beats_config.py
@@ -52,7 +52,7 @@ def to_dict(self) -> Dict[str, Any]:
         
         :return: a dict representation of the object
         """
-        d = {}
+        d: Dict[str, Any] = {}
         d["node_beats_configs"] = list(map(lambda x: x.to_dict(), self.node_beats_configs))
         d["num_elastic_shards"] = self.num_elastic_shards
         d["reload_enabled"] = self.reload_enabled
diff --git a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/config.py b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/config.py
index 43872086d..883d031cb 100644
--- a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/config.py
+++ b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/config.py
@@ -180,7 +180,7 @@ def to_dict(self) -> Dict[str, Any]:
 
         :return: a dict representation of the object
         """
-        d = {}
+        d: Dict[str, Any] = {}
         d["management_admin_username_default"] = self.management_admin_username_default
         d["management_admin_password_default"] = self.management_admin_password_default
         d[
@@ -249,7 +249,7 @@ def to_param_dict(self) -> Dict[str, Any]:
         """
         :return: a param-dict representation of the object
         """
-        d = {}
+        d: Dict[str, Any] = {}
         d["parameters"] = []
         d["parameters"].append(
             {
diff --git a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/default_network_firewall_config.py b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/default_network_firewall_config.py
index ce1eccad8..505f58048 100644
--- a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/default_network_firewall_config.py
+++ b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/default_network_firewall_config.py
@@ -48,7 +48,7 @@ def to_dict(self) -> Dict[str, Any]:
 
         :return: a dict representation of the object
         """
-        d = {}
+        d: Dict[str, Any] = {}
         d["ip"] = self.ip
         d["default_gw"] = self.default_gw
         d["default_input"] = self.default_input
diff --git a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/flags_config.py b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/flags_config.py
index 2ab327007..9f863df32 100644
--- a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/flags_config.py
+++ b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/flags_config.py
@@ -53,7 +53,7 @@ def get_flags_for_ips(self, ips: List[str]) -> List[Flag]:
         :param ips: the list of ip addresses to get flags for
         :return: the list of flags
         """
-        flags = []
+        flags: List[Flag] = []
         for node_flag_config in self.node_flag_configs:
             if node_flag_config.ip in ips:
                 flags = flags + node_flag_config.flags
diff --git a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/users_config.py b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/users_config.py
index 39641845b..e2c3ae9a6 100644
--- a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/users_config.py
+++ b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/users_config.py
@@ -52,7 +52,7 @@ def get_root_usernames(self, ips: List[str]) -> List[str]:
         :param ips: the list of ips to get the root usernames for
         :return: the list of root usernames
         """
-        root_usernames = []
+        root_usernames: List[str] = []
         for users_config in self.users_configs:
             if users_config.ip in ips:
                 root_usernames = root_usernames + users_config.users