Index: /waeup/branches/ulif-rewrite/src/waeup/university/certificate.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/university/certificate.py	(revision 4288)
+++ /waeup/branches/ulif-rewrite/src/waeup/university/certificate.py	(revision 4289)
@@ -10,36 +10,24 @@
     grok.implements(ICertificate)
 
-    def __init__(self, code='NA'):
+    def __init__(self, code='NA', title='Unnamed', level=None,
+                 credits = 0, passmark=40, semester=1):
         self.code = code
+        self.title = title
+        self.level = level
+        self.credits = credits
+        self.passmark = passmark
+        self.semester = semester
 
-class CertificateContainer(grok.Container):
-    """See interfaces for description.
-    """
-    grok.implements(ICertificateContainer)
-    grok.require('waeup.manageUniversity')
-
-    def addCertificate(self, certificate):
-        if not ICertificate.providedBy(certificate):
-            raise TypeError('CertificateContainers contain only '
-                            'ICertificate instances')
-        self[certificate.code] = certificate
-        return
-
-    def clear(self):
-        keys = self.keys()
-        for key in keys:
-            del self[key]
-
-class CertificateContainerFactory(grok.GlobalUtility):
-    """A factory for certificate containers.
+class CertificateFactory(grok.GlobalUtility):
+    """A factory for certificates.
     """
     grok.implements(IFactory)
-    grok.name(u'waeup.CertificateContainer')
-    title = u"Create a new certificate container.",
-    description = u"This factory instantiates new certificate containers."
+    grok.name(u'waeup.Certificate')
+    title = u"Create a new certificate.",
+    description = u"This factory instantiates new certificate instances."
 
     def __call__(self):
-        return CertificateContainer()
+        return Certificate()
 
     def getInterfaces(self):
-        return implementedBy(CertificateContainer)
+        return implementedBy(Certificate)
Index: /waeup/branches/ulif-rewrite/src/waeup/university/certificatecontainer.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/university/certificatecontainer.py	(revision 4289)
+++ /waeup/branches/ulif-rewrite/src/waeup/university/certificatecontainer.py	(revision 4289)
@@ -0,0 +1,37 @@
+"""Containers for certificates.
+"""
+import grok
+from waeup.interfaces import ICertificateContainer, ICertificate
+from zope.component.interfaces import IFactory
+
+class CertificateContainer(grok.Container):
+    """See interfaces for description.
+    """
+    grok.implements(ICertificateContainer)
+    grok.require('waeup.manageUniversity')
+
+    def addCertificate(self, certificate):
+        if not ICertificate.providedBy(certificate):
+            raise TypeError('CertificateContainers contain only '
+                            'ICertificate instances')
+        self[certificate.code] = certificate
+        return
+
+    def clear(self):
+        keys = self.keys()
+        for key in keys:
+            del self[key]
+
+class CertificateContainerFactory(grok.GlobalUtility):
+    """A factory for certificate containers.
+    """
+    grok.implements(IFactory)
+    grok.name(u'waeup.CertificateContainer')
+    title = u"Create a new certificate container.",
+    description = u"This factory instantiates new certificate containers."
+
+    def __call__(self):
+        return CertificateContainer()
+
+    def getInterfaces(self):
+        return implementedBy(CertificateContainer)
