diff --git a/samples/oss-service.yaml b/samples/oss-service.yaml
index c24b306..c77dc88 100644
--- a/samples/oss-service.yaml
+++ b/samples/oss-service.yaml
@@ -16,12 +16,12 @@
 
 tosca_definitions_version: tosca_simple_yaml_1_0
 imports:
-  - custom_types/attworkflowservice.yaml
+  - custom_types/attworkflowdriverservice.yaml
 description: Create an instance of the OSS Service and connect it to the vOLT Service
 topology_template:
   node_templates:
     service#oss:
-      type: tosca.nodes.ATTWorkflowService
+      type: tosca.nodes.AttWorkflowDriverService
       properties:
-        name: workflow
-        kind: control
+        name: att-workflow-driver
+        kind: oss
diff --git a/samples/whitelist.yaml b/samples/whitelist.yaml
new file mode 100644
index 0000000..5cc364a
--- /dev/null
+++ b/samples/whitelist.yaml
@@ -0,0 +1,38 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @oss-service.yaml http://192.168.99.100:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/attworkflowdriverwhitelistentry.yaml
+  - custom_types/attworkflowdriverservice.yaml
+description: Create an entry in the whitelist
+topology_template:
+  node_templates:
+
+    service#att:
+      type: tosca.nodes.AttWorkflowDriverService
+      properties:
+        name: att-workflow-driver
+        must-exist: true
+
+    whitelist:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: BRCM22222222
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
diff --git a/xos/synchronizer/models/convenience/attworkflowdriverservice.py b/xos/synchronizer/models/convenience/attworkflowdriverservice.py
new file mode 100644
index 0000000..c692975
--- /dev/null
+++ b/xos/synchronizer/models/convenience/attworkflowdriverservice.py
@@ -0,0 +1,49 @@
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# validate_onu received event:
+# {
+#     'status': 'activate',
+#     'serial_number': 'BRCM1234',
+#     'of_dpid': 'of:109299321'
+# }
+
+from xosapi.orm import register_convenience_wrapper
+from xosapi.convenience.serviceinstance import ORMWrapperServiceInstance
+
+import logging as log
+
+class ORMWrapperAttWorkflowService(ORMWrapperServiceInstance):
+
+    def validate_onu(self, event):
+
+        log.info("onu.events: validating ONU %s" % event["serial_number"], event=event)
+
+        try:
+            oss_si = self.stub.AttWorkflowDriverServiceInstance.objects.get(serial_number=event["serial_number"])
+            oss_si.no_sync = False;
+            log.debug("onu.events: Found existing AttWorkflowDriverServiceInstance", si=oss_si)
+        except IndexError:
+            # create an AttWorkflowDriverServiceInstance, the validation will be triggered in the corresponding sync step
+            oss_si = self.stub.AttWorkflowDriverServiceInstance(
+                serial_number=event["serial_number"],
+                of_dpid=event["of_dpid"]
+            )
+            log.debug("onu.events: Created new AttWorkflowDriverServiceInstance", si=oss_si)
+        
+        oss_si.save(always_update_timestamp=True)
+
+register_convenience_wrapper("AttWorkflowDriverService", ORMWrapperAttWorkflowService)