--- a/src/pyams_content/shared/topic/manager.py	Wed Nov 06 16:54:59 2019 +0100
+++ b/src/pyams_content/shared/topic/manager.py	Tue Nov 19 16:39:10 2019 +0100
@@ -10,8 +10,6 @@
 # FOR A PARTICULAR PURPOSE.
 #
 
-__docformat__ = 'restructuredtext'
-
 from pyramid.events import subscriber
 from zope.component.interfaces import ISite
 from zope.interface import implementer
@@ -22,16 +20,21 @@
 from pyams_content.component.theme.interfaces import IThemesManagerTarget
 from pyams_content.reference.pictograms.interfaces import IPictogramManagerTarget
 from pyams_content.shared.common.interfaces import ISharedContentFactory
-from pyams_content.shared.common.types import TypedSharedTool
+from pyams_content.shared.common.manager import SharedTool
+from pyams_content.shared.common.types import TypedSharedToolMixin
 from pyams_content.shared.topic import Topic
-from pyams_content.shared.topic.interfaces import ITopicManager, ITopicManagerFactory, TOPIC_CONTENT_TYPE
+from pyams_content.shared.topic.interfaces import ITopicManager, ITopicManagerFactory, \
+    TOPIC_CONTENT_TYPE
 from pyams_utils.adapter import adapter_config
 from pyams_utils.registry import utility_config
 from pyams_utils.traversing import get_parent
 
 
+__docformat__ = 'restructuredtext'
+
+
 @implementer(ITopicManager, IParagraphFactorySettings, IThemesManagerTarget, IPictogramManagerTarget)
-class TopicManager(TypedSharedTool):
+class TopicManager(SharedTool, TypedSharedToolMixin):
     """Topic manager class"""
 
     shared_content_type = TOPIC_CONTENT_TYPE