--- a/src/pyams_content/shared/topic/__init__.py	Wed Nov 06 16:54:59 2019 +0100
+++ b/src/pyams_content/shared/topic/__init__.py	Tue Nov 19 16:39:10 2019 +0100
@@ -10,27 +10,29 @@
 # FOR A PARTICULAR PURPOSE.
 #
 
-__docformat__ = 'restructuredtext'
-
 from zope.interface import implementer, provider
 from zope.schema.fieldproperty import FieldProperty
 
-from pyams_content.component.illustration.interfaces import IIllustrationTarget, ILinkIllustrationTarget
+from pyams_content.component.illustration.interfaces import IIllustrationTarget, \
+    ILinkIllustrationTarget
 from pyams_content.component.paragraph.interfaces import IParagraphContainerTarget
 from pyams_content.component.theme.interfaces import ITagsTarget, IThemesTarget
 from pyams_content.features.preview.interfaces import IPreviewTarget
 from pyams_content.features.review.interfaces import IReviewTarget
-from pyams_content.shared.common import SharedContent, register_content_type
+from pyams_content.shared.common import SharedContent, WfSharedContent, register_content_type
 from pyams_content.shared.common.interfaces import IWfSharedContentFactory
-from pyams_content.shared.common.types import WfTypedSharedContent
-from pyams_content.shared.topic.interfaces import ITopic, IWfTopic, IWfTopicFactory, TOPIC_CONTENT_NAME, \
-    TOPIC_CONTENT_TYPE
+from pyams_content.shared.common.types import WfTypedSharedContentMixin
+from pyams_content.shared.topic.interfaces import ITopic, IWfTopic, IWfTopicFactory, \
+    TOPIC_CONTENT_NAME, TOPIC_CONTENT_TYPE
 from pyams_utils.adapter import adapter_config
 
 
+__docformat__ = 'restructuredtext'
+
+
 @implementer(IWfTopic, IIllustrationTarget, ILinkIllustrationTarget, IParagraphContainerTarget,
              ITagsTarget, IThemesTarget, IPreviewTarget, IReviewTarget)
-class WfTopic(WfTypedSharedContent):
+class WfTopic(WfSharedContent, WfTypedSharedContentMixin):
     """Base topic"""
 
     content_type = TOPIC_CONTENT_TYPE