--- a/src/pyams_content/shared/resource/manager.py	Wed Nov 06 16:54:59 2019 +0100
+++ b/src/pyams_content/shared/resource/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,7 +20,8 @@
 from pyams_content.component.theme import ICollectionsManagerTarget, 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.resource import IResourceInfo, RESOURCE_CONTENT_TYPE, Resource
 from pyams_content.shared.resource.interfaces import IResourceManager, IResourceManagerFactory
 from pyams_utils.adapter import adapter_config
@@ -30,9 +29,12 @@
 from pyams_utils.traversing import get_parent
 
 
+__docformat__ = 'restructuredtext'
+
+
 @implementer(IResourceManager, IParagraphFactorySettings, IPictogramManagerTarget,
              IThemesManagerTarget, ICollectionsManagerTarget)
-class ResourceManager(TypedSharedTool):
+class ResourceManager(SharedTool, TypedSharedToolMixin):
     """Resource manager class"""
 
     shared_content_type = RESOURCE_CONTENT_TYPE