diff --git a/core/etl/loader/base.py b/core/etl/loader/base.py
index 71e2949906e454ee595538ee84d2edba0f6c2f02..9dcafe0cc088aee439c3b47eef508600ca6fbe9c 100644
--- a/core/etl/loader/base.py
+++ b/core/etl/loader/base.py
@@ -455,6 +455,8 @@ class BaseLoader(object):
         self.pending_deletes += [(item.id, item)]
 
     def change_workflow(self, o, state: str, changed_date: Optional[datetime.datetime] = None):
+        if not o:
+            return
         state = self.clean_wf_state(o.profile.workflow, state)
         if state and o.state != state:
             self.logger.debug("Change workflow state: %s -> %s", o.state, state)
diff --git a/core/etl/models/service.py b/core/etl/models/service.py
index 05df4664a1beb5997516f7ffd9c2847babfd3782..444a8d70b910bb9557b6b49213f60ccdb90ea5bf 100644
--- a/core/etl/models/service.py
+++ b/core/etl/models/service.py
@@ -6,7 +6,7 @@
 # ----------------------------------------------------------------------
 
 # Python modules
-from typing import Optional
+from typing import Optional, List
 from datetime import datetime
 
 # NOC modules
@@ -42,6 +42,7 @@ class Service(BaseModel):
     cpe_mac: Optional[str]
     cpe_model: Optional[str]
     cpe_group: Optional[str]
+    labels: Optional[List[str]]
     description: Optional[str] = None
 
     class Config:
@@ -70,4 +71,5 @@ class Service(BaseModel):
         "cpe_model",
         "cpe_group",
         "description",
+        "labels",
     ]