Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py	(revision 6957)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py	(revision 6958)
@@ -4,4 +4,5 @@
 from zope import schema
 from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.hostels.vocabularies import bed_letters, blocks
 
 class IHostelsContainer(IWAeUPObject):
@@ -18,6 +19,4 @@
         """Adds an INFO message to the log file
         """
-
-    #hostel_id = Attribute('Hostel Id')
 
     hostel_id = schema.TextLine(
@@ -45,5 +44,5 @@
 
     nr_of_floors = schema.Int(
-        title = u'Number of Blocks',
+        title = u'Number of Floors',
         required = True,
         default = 3,
@@ -51,5 +50,5 @@
 
     rooms_per_floor = schema.Int(
-        title = u'Number of Blocks',
+        title = u'Rooms per Floor',
         required = True,
         default = 20,
@@ -57,7 +56,27 @@
 
     beds_per_room = schema.Int(
-        title = u'Number of Blocks',
+        title = u'Beds per Room',
         required = True,
         default = 6,
         )
 
+    blocks_for_female = schema.List(
+        title = u'Blocks for Female Students',
+        value_type = schema.Choice(
+            vocabulary = blocks
+            ),
+        )
+
+    beds_for_fresh = schema.List(
+        title = u'Beds for Fresh Students',
+        value_type = schema.Choice(
+            vocabulary = bed_letters
+            ),
+        )
+
+    beds_for_final = schema.List(
+        title = u'Beds for Final Year Students',
+        value_type = schema.Choice(
+            vocabulary = bed_letters
+            ),
+        )
Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/vocabularies.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/vocabularies.py	(revision 6958)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/vocabularies.py	(revision 6958)
@@ -0,0 +1,35 @@
+"""Vocabularies and sources for the accommodation section.
+"""
+from zc.sourcefactory.basic import BasicSourceFactory
+from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+
+
+bed_letters = SimpleWAeUPVocabulary(
+    ('Bed A','A'),
+    ('Bed B','B'),
+    ('Bed C','C'),
+    ('Bed D','D'),
+    ('Bed E','E'),
+    ('Bed F','F'),
+    ('Bed G','G'),
+    ('Bed H','H'),
+    ('Bed I','I'),
+    )
+
+blocks = SimpleWAeUPVocabulary(
+    ('Block A','A'),
+    ('Block B','B'),
+    ('Block C','C'),
+    ('Block D','D'),
+    ('Block E','E'),
+    ('Block F','F'),
+    ('Block G','G'),
+    ('Block H','H'),
+    ('Block I','I'),
+    ('Block K','K'),
+    ('Block L','L'),
+    ('Block M','M'),
+    ('Block N','N'),
+    ('Block O','O'),
+    ('Block P','P'),
+    )
