-from o2ims.service.client.base_client import BaseClient\r
-from o2ims.service.unit_of_work import AbstractUnitOfWork\r
-from o2ims.service.watcher.base import BaseWatcher\r
+from o2ims.domain.stx_object import StxGenericModel\r
+from o2common.service.client.base_client import BaseClient\r
+# from o2common.service.unit_of_work import AbstractUnitOfWork\r
+from o2common.service.watcher.base import BaseWatcher\r
+from o2ims.domain import commands\r
+from o2common.service.messagebus import MessageBus\r