diff --git a/voltha/adapters/cig_openomci_onu/cig_openomci_onu.py b/voltha/adapters/cig_openomci_onu/cig_openomci_onu.py
index 1162c6e..f81bc26 100755
--- a/voltha/adapters/cig_openomci_onu/cig_openomci_onu.py
+++ b/voltha/adapters/cig_openomci_onu/cig_openomci_onu.py
@@ -77,9 +77,9 @@
         # Customize OpenOMCI for CIG ONUs
         self.broadcom_omci = deepcopy(OpenOmciAgentDefaults)
 
-        # self.broadcom_omci['mib-synchronizer']['state-machine'] = BrcmMibSynchronizer
-        # self.broadcom_omci['mib-synchronizer']['database'] = MibDbVolatileDict
-        # self.broadcom_omci['omci-capabilities']['tasks']['get-capabilities'] = BrcmCapabilitiesTask
+        self.broadcom_omci['mib-synchronizer']['state-machine'] = BrcmMibSynchronizer
+        self.broadcom_omci['mib-synchronizer']['database'] = MibDbVolatileDict
+        self.broadcom_omci['omci-capabilities']['tasks']['get-capabilities'] = BrcmCapabilitiesTask
 
         self._omci_agent = OpenOMCIAgent(self.adapter_agent.core,
                                          support_classes=self.broadcom_omci)