--- a/src/pyams_content/component/links/container.py	Mon Oct 24 15:54:38 2016 +0200
+++ b/src/pyams_content/component/links/container.py	Tue Nov 15 09:47:14 2016 +0100
@@ -21,7 +21,6 @@
 from pyams_i18n.interfaces import II18n
 from zope.annotation.interfaces import IAnnotations
 from zope.location.interfaces import ISublocations
-from zope.schema.interfaces import IVocabularyFactory
 from zope.traversing.interfaces import ITraversable
 
 # import packages
@@ -29,13 +28,14 @@
 from persistent.list import PersistentList
 from pyams_utils.adapter import adapter_config, ContextAdapter
 from pyams_utils.traversing import get_parent
+from pyams_utils.vocabulary import vocabulary_config
 from pyramid.threadlocal import get_current_registry
 from zope.container.contained import Contained
 from zope.container.folder import Folder
-from zope.interface import implementer, provider
+from zope.interface import implementer
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.location import locate
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm, getVocabularyRegistry
+from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 
 
 @implementer(ILinkContainer)
@@ -78,7 +78,7 @@
         return ILinkContainer(self.context).values()
 
 
-@provider(IVocabularyFactory)
+@vocabulary_config(name='PyAMS content links')
 class LinkContainerLinksVocabulary(SimpleVocabulary):
     """Links container links vocabulary"""
 
@@ -88,8 +88,6 @@
                  for link in ILinkContainer(target).values()]
         super(LinkContainerLinksVocabulary, self).__init__(terms)
 
-getVocabularyRegistry().register('PyAMS content links', LinkContainerLinksVocabulary)
-
 
 #
 # Link links container