--- a/src/pyams_content/root/__init__.py	Fri Jun 15 22:17:34 2018 +0200
+++ b/src/pyams_content/root/__init__.py	Sun Jun 17 16:41:24 2018 +0200
@@ -29,8 +29,9 @@
 from pyams_form.interfaces.form import IFormContextPermissionChecker
 from pyams_portal.interfaces import IPortalContext
 from pyams_security.interfaces import IDefaultProtectionPolicy, IGrantedRoleEvent, ISecurityManager
+from pyams_skin.interfaces.configuration import IConfiguration, IBackOfficeConfiguration
 from pyams_utils.interfaces import MANAGE_SYSTEM_PERMISSION
-from pyams_utils.interfaces.site import IConfigurationFactory, IBackOfficeConfigurationFactory, ISiteRootFactory
+from pyams_utils.interfaces.site import ISiteRootFactory
 
 # import packages
 from persistent import Persistent
@@ -39,6 +40,7 @@
 from pyams_skin.configuration import Configuration, BackOfficeConfiguration
 from pyams_skin.skin import UserSkinnableContent
 from pyams_utils.adapter import adapter_config, ContextAdapter, get_annotation_adapter
+from pyams_utils.factory import factory_config
 from pyams_utils.registry import get_utility, utility_config
 from pyams_utils.site import BaseSiteRoot
 from pyams_utils.traversing import get_parent
@@ -70,25 +72,17 @@
 
 
 @implementer(ISiteRootConfiguration)
+@factory_config(provided=IConfiguration)
 class SiteRootConfiguration(Configuration):
     """Site root configuration"""
 
 
-@adapter_config(context=ISiteRoot, provides=IConfigurationFactory)
-def site_root_configuration_factory(context):
-    return SiteRootConfiguration
-
-
 @implementer(ISiteRootBackOfficeConfiguration)
+@factory_config(provided=IBackOfficeConfiguration)
 class SiteRootBackOfficeConfiguration(BackOfficeConfiguration):
     """Site root back-office configuration"""
 
 
-@adapter_config(context=ISiteRoot, provides=IBackOfficeConfigurationFactory)
-def site_root_back_office_configuration_factory(context):
-    return SiteRootBackOfficeConfiguration
-
-
 @subscriber(IGrantedRoleEvent)
 def handle_granted_role(event):
     """Add principals to operators group when a role is granted"""