--- a/src/pyams_utils/encoding.py	Tue Nov 15 10:43:03 2016 +0100
+++ b/src/pyams_utils/encoding.py	Tue Nov 15 10:43:55 2016 +0100
@@ -16,13 +16,14 @@
 # import standard library
 
 # import interfaces
-from zope.schema.interfaces import IVocabularyFactory, IChoice
+from zope.schema.interfaces import IChoice
 
 # import packages
 from pyams_utils.request import check_request
-from zope.interface import provider, implementer
+from pyams_utils.vocabulary import vocabulary_config
+from zope.interface import implementer
 from zope.schema import Choice
-from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary, getVocabularyRegistry
+from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
 
 from pyams_utils import _
 
@@ -123,7 +124,7 @@
 }
 
 
-@provider(IVocabularyFactory)
+@vocabulary_config(name='PyAMS encodings')
 class EncodingsVocabulary(SimpleVocabulary):
 
     def __init__(self, terms, *interfaces):
@@ -133,8 +134,6 @@
         terms.sort(key=lambda x: x.title)
         super(EncodingsVocabulary, self).__init__(terms, *interfaces)
 
-getVocabularyRegistry().register('PyAMS encodings', EncodingsVocabulary)
-
 
 class IEncodingField(IChoice):
     """Encoding field interface"""