--- a/src/pyams_content/root/__init__.py	Fri May 25 08:05:13 2018 +0200
+++ b/src/pyams_content/root/__init__.py	Fri May 25 15:48:59 2018 +0200
@@ -30,7 +30,6 @@
 from pyams_security.interfaces import IDefaultProtectionPolicy, IGrantedRoleEvent, ISecurityManager
 from pyams_utils.interfaces import MANAGE_SYSTEM_PERMISSION
 from pyams_utils.interfaces.site import IConfigurationFactory, IBackOfficeConfigurationFactory, ISiteRootFactory
-from zope.annotation.interfaces import IAnnotations
 
 # import packages
 from persistent import Persistent
@@ -38,7 +37,7 @@
 from pyams_security.security import ProtectedObject
 from pyams_skin.configuration import Configuration, BackOfficeConfiguration
 from pyams_skin.skin import UserSkinnableContent
-from pyams_utils.adapter import adapter_config, ContextAdapter
+from pyams_utils.adapter import adapter_config, ContextAdapter, get_annotation_adapter
 from pyams_utils.registry import get_utility, utility_config
 from pyams_utils.site import BaseSiteRoot
 from pyams_utils.traversing import get_parent
@@ -136,14 +135,11 @@
     logos_tool_name = None
     news_tool_name = None
 
+
 SITEROOT_TOOLS_CONFIGURATION_KEY = 'pyams_config.tools.configuration'
 
 
 @adapter_config(context=ISiteRoot, provides=ISiteRootToolsConfiguration)
 def site_root_tools_configuration_factory(context):
     """Site root tools configuration factory"""
-    annotations = IAnnotations(context)
-    config = annotations.get(SITEROOT_TOOLS_CONFIGURATION_KEY)
-    if config is None:
-        config = annotations[SITEROOT_TOOLS_CONFIGURATION_KEY] = SiteRootToolsConfiguration()
-    return config
+    return get_annotation_adapter(context, SITEROOT_TOOLS_CONFIGURATION_KEY, SiteRootToolsConfiguration)