diff --git a/daemon/core/api/grpc/grpcutils.py b/daemon/core/api/grpc/grpcutils.py
index cf3f2a95..7797c86e 100644
--- a/daemon/core/api/grpc/grpcutils.py
+++ b/daemon/core/api/grpc/grpcutils.py
@@ -86,13 +86,8 @@ def add_link_data(
     """
     interface_one = link_interface(link_proto.interface_one)
     interface_two = link_interface(link_proto.interface_two)
-
-    link_type = None
-    link_type_value = link_proto.type
-    if link_type_value is not None:
-        link_type = LinkTypes(link_type_value)
-
-    options = LinkOptions(_type=link_type)
+    link_type = LinkTypes(link_proto.type)
+    options = LinkOptions(type=link_type)
     options_data = link_proto.options
     if options_data:
         options.delay = options_data.delay
@@ -106,7 +101,6 @@ def add_link_data(
         options.unidirectional = options_data.unidirectional
         options.key = options_data.key
         options.opaque = options_data.opaque
-
     return interface_one, interface_two, options
 
 
diff --git a/daemon/core/api/tlv/corehandlers.py b/daemon/core/api/tlv/corehandlers.py
index a79d7d6d..f3e1fbaa 100644
--- a/daemon/core/api/tlv/corehandlers.py
+++ b/daemon/core/api/tlv/corehandlers.py
@@ -772,7 +772,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
         if link_type_value is not None:
             link_type = LinkTypes(link_type_value)
 
-        link_options = LinkOptions(_type=link_type)
+        link_options = LinkOptions(type=link_type)
         link_options.delay = message.get_tlv(LinkTlvs.DELAY.value)
         link_options.bandwidth = message.get_tlv(LinkTlvs.BANDWIDTH.value)
         link_options.session = message.get_tlv(LinkTlvs.SESSION.value)
diff --git a/daemon/core/emulator/emudata.py b/daemon/core/emulator/emudata.py
index 3c33ce65..f47da004 100644
--- a/daemon/core/emulator/emudata.py
+++ b/daemon/core/emulator/emudata.py
@@ -93,34 +93,28 @@ class NodeOptions:
         self.alt = alt
 
 
+@dataclass
 class LinkOptions:
     """
     Options for creating and updating links within core.
     """
 
-    def __init__(self, _type: LinkTypes = LinkTypes.WIRED) -> None:
-        """
-        Create a LinkOptions object.
-
-        :param _type: type of link, defaults to
-            wired
-        """
-        self.type = _type
-        self.session = None
-        self.delay = None
-        self.bandwidth = None
-        self.per = None
-        self.dup = None
-        self.jitter = None
-        self.mer = None
-        self.burst = None
-        self.mburst = None
-        self.gui_attributes = None
-        self.unidirectional = None
-        self.emulation_id = None
-        self.network_id = None
-        self.key = None
-        self.opaque = None
+    type: LinkTypes = LinkTypes.WIRED
+    session: int = None
+    delay: int = None
+    bandwidth: int = None
+    per: float = None
+    dup: int = None
+    jitter: int = None
+    mer: int = None
+    burst: int = None
+    mburst: int = None
+    gui_attributes: str = None
+    unidirectional: bool = None
+    emulation_id: int = None
+    network_id: int = None
+    key: int = None
+    opaque: str = None
 
 
 @dataclass
diff --git a/daemon/tests/test_gui.py b/daemon/tests/test_gui.py
index 89dcd7ab..800a8e62 100644
--- a/daemon/tests/test_gui.py
+++ b/daemon/tests/test_gui.py
@@ -511,7 +511,7 @@ class TestGui:
             EventTypes.DEFINITION_STATE,
         ],
     )
-    def test_event_state(self, coretlv, state):
+    def test_event_state(self, coretlv: CoreHandler, state: EventTypes):
         message = coreapi.CoreEventMessage.create(0, [(EventTlvs.TYPE, state.value)])
 
         coretlv.handle_message(message)
@@ -536,7 +536,7 @@ class TestGui:
 
         coretlv.session.add_event.assert_called_once()
 
-    def test_event_save_xml(self, coretlv, tmpdir):
+    def test_event_save_xml(self, coretlv: CoreHandler, tmpdir):
         xml_file = tmpdir.join("coretlv.session.xml")
         file_path = xml_file.strpath
         coretlv.session.add_node(CoreNode)
@@ -549,7 +549,7 @@ class TestGui:
 
         assert os.path.exists(file_path)
 
-    def test_event_open_xml(self, coretlv, tmpdir):
+    def test_event_open_xml(self, coretlv: CoreHandler, tmpdir):
         xml_file = tmpdir.join("coretlv.session.xml")
         file_path = xml_file.strpath
         node = coretlv.session.add_node(CoreNode)
@@ -573,7 +573,7 @@ class TestGui:
             EventTypes.RECONFIGURE,
         ],
     )
-    def test_event_service(self, coretlv, state):
+    def test_event_service(self, coretlv: CoreHandler, state: EventTypes):
         coretlv.session.broadcast_event = mock.MagicMock()
         node = coretlv.session.add_node(CoreNode)
         message = coreapi.CoreEventMessage.create(
@@ -599,7 +599,7 @@ class TestGui:
             EventTypes.RECONFIGURE,
         ],
     )
-    def test_event_mobility(self, coretlv, state):
+    def test_event_mobility(self, coretlv: CoreHandler, state: EventTypes):
         message = coreapi.CoreEventMessage.create(
             0, [(EventTlvs.TYPE, state.value), (EventTlvs.NAME, "mobility:ns2script")]
         )
@@ -610,7 +610,7 @@ class TestGui:
         message = coreapi.CoreRegMessage.create(0, [(RegisterTlvs.GUI, "gui")])
         coretlv.handle_message(message)
 
-    def test_register_xml(self, coretlv, tmpdir):
+    def test_register_xml(self, coretlv: CoreHandler, tmpdir):
         xml_file = tmpdir.join("coretlv.session.xml")
         file_path = xml_file.strpath
         node = coretlv.session.add_node(CoreNode)
@@ -625,7 +625,7 @@ class TestGui:
 
         assert coretlv.coreemu.sessions[1].get_node(node.id, CoreNode)
 
-    def test_register_python(self, coretlv, tmpdir):
+    def test_register_python(self, coretlv: CoreHandler, tmpdir):
         xml_file = tmpdir.join("test.py")
         file_path = xml_file.strpath
         with open(file_path, "w") as f: