--- a/src/pyams_content/reference/pictograms/manager.py	Wed Jan 16 19:10:46 2019 +0100
+++ b/src/pyams_content/reference/pictograms/manager.py	Thu Jan 17 12:17:24 2019 +0100
@@ -12,28 +12,23 @@
 
 __docformat__ = 'restructuredtext'
 
+from persistent import Persistent
+from zope.container.contained import Contained
+from zope.schema.fieldproperty import FieldProperty
+from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
 
-# import standard library
-from persistent import Persistent
-
-# import interfaces
+from pyams_content.reference.pictograms.interfaces import IPictogramManager, IPictogramManagerTarget, IPictogramTable, \
+    PICTOGRAM_MANAGER_KEY, SELECTED_PICTOGRAM_VOCABULARY
 from pyams_i18n.interfaces import II18n
-from pyams_content.reference.pictograms.interfaces import IPictogramTable, IPictogramManager, IPictogramManagerTarget, \
-    PICTOGRAM_MANAGER_KEY, SELECTED_PICTOGRAM_VOCABULARY
-
-# import packages
 from pyams_utils.adapter import adapter_config, get_annotation_adapter
+from pyams_utils.factory import factory_config
 from pyams_utils.registry import query_utility
 from pyams_utils.request import check_request
 from pyams_utils.traversing import get_parent
 from pyams_utils.vocabulary import vocabulary_config
-from zope.container.contained import Contained
-from zope.interface import implementer
-from zope.schema.fieldproperty import FieldProperty
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 
 
-@implementer(IPictogramManager)
+@factory_config(IPictogramManager)
 class PictogramManager(Persistent, Contained):
     """Pictogram manager settings persistent class"""
 
@@ -43,7 +38,7 @@
 @adapter_config(context=IPictogramManagerTarget, provides=IPictogramManager)
 def pictogram_manager_factory(target):
     """Pictogram manager factory"""
-    return get_annotation_adapter(target, PICTOGRAM_MANAGER_KEY, PictogramManager)
+    return get_annotation_adapter(target, PICTOGRAM_MANAGER_KEY, IPictogramManager)
 
 
 @vocabulary_config(name=SELECTED_PICTOGRAM_VOCABULARY)