Index: /main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py	(revision 8605)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py	(revision 8606)
@@ -19,9 +19,9 @@
 """
 from zc.sourcefactory.basic import BasicSourceFactory
-from zc.sourcefactory.contextual import BasicContextualSourceFactory
 from zope.catalog.interfaces import ICatalog
 from zope.component import getUtility, queryUtility
 from waeup.kofa.interfaces import SimpleKofaVocabulary, IKofaUtils
 from waeup.kofa.interfaces import MessageFactory as _
+from waeup.kofa.sourcefactory import SmartBasicContextualSourceFactory
 from waeup.kofa.utils.utils import KofaUtils
 
@@ -43,5 +43,5 @@
 KOFA_UTILS = KofaUtils()
 
-class ContextualDictSourceFactoryBase(BasicContextualSourceFactory):
+class ContextualDictSourceFactoryBase(SmartBasicContextualSourceFactory):
     """A base for contextual sources based on KofaUtils dicts.
 
@@ -103,5 +103,7 @@
         return "%s - %s" % (value.code, value.title[:64])
 
-class CertificateSource(BasicContextualSourceFactory):
+
+
+class CertificateSource(SmartBasicContextualSourceFactory):
     """A certificate source delivers all certificates provided
     in the portal.
