diff --git a/lib/dl_core/dl_core/us_entry.py b/lib/dl_core/dl_core/us_entry.py
index 604bacf9d..d8fa629d5 100644
--- a/lib/dl_core/dl_core/us_entry.py
+++ b/lib/dl_core/dl_core/us_entry.py
@@ -196,12 +196,14 @@ def has_data(self) -> bool:
         return self._data is not None
 
     @property
-    def data(self):  # type: ignore  # TODO: fix
+    def data(self) -> BaseAttrsDataModel:
         assert self._data is not None
         return self._data
 
     @data.setter
-    def data(self, value):  # type: ignore  # TODO: fix
+    def data(self, value: BaseAttrsDataModel) -> None:
+        if not isinstance(value, self.DataModel):
+            raise TypeError(f"Expected {self.DataModel}, got {type(value)}")
         self._data = value
 
     @property