Index: lams_tool_nb/conf/hibernate/mapping/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml
===================================================================
diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -r37ee954e20001d84e583274b416d2f0dde3a0e6c
--- lams_tool_nb/conf/hibernate/mapping/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml	(.../NoticeboardContent.hbm.xml)	(revision a766c8fe51dfa314947b20ef98e525d63b328fbe)
+++ lams_tool_nb/conf/hibernate/mapping/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml	(.../NoticeboardContent.hbm.xml)	(revision 37ee954e20001d84e583274b416d2f0dde3a0e6c)
@@ -21,22 +21,38 @@
     </meta>
 
     <id
-        name="nbContentId"
+        name="uid"
         type="java.lang.Long"
-        column="nb_content_id"
+        column="uid"
+        unsaved-value="0"
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="native"
             type="java.lang.Long"
-            column="nb_content_id"
+            column="uid"
+            unsaved-value="0"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="native" />
     </id>
 
     <property
+        name="nbContentId"
+        type="java.lang.Long"
+        column="nb_content_id"
+        not-null="true"
+        length="20"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="nb_content_id"
+            length="20"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
         name="title"
         type="java.lang.String"
         column="title"
@@ -147,12 +163,12 @@
 
     <!-- Associations -->
   
-    <!-- bi-directional one-to-many association to TlLanb11Session -->
+    <!-- bi-directional one-to-many association to NoticeboardSession -->
     <set
         name="nbSessions"
         lazy="true"
         inverse="true"
-		cascade="none"
+		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
@@ -161,13 +177,13 @@
             cascade="none"
 
            @hibernate.collection-key
-            column="nb_content_id"
+            column="nb_content_uid"
 
            @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession"
+            class="org.lamsfoundation.lams.tool.noticeboard.TlLanb11Session"
         </meta>
         <key>
-            <column name="nb_content_id" />
+            <column name="nb_content_uid" />
         </key>
         <one-to-many 
             class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession"
Index: lams_tool_nb/conf/hibernate/mapping/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml
===================================================================
diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -r37ee954e20001d84e583274b416d2f0dde3a0e6c
--- lams_tool_nb/conf/hibernate/mapping/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml	(.../NoticeboardSession.hbm.xml)	(revision a766c8fe51dfa314947b20ef98e525d63b328fbe)
+++ lams_tool_nb/conf/hibernate/mapping/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml	(.../NoticeboardSession.hbm.xml)	(revision 37ee954e20001d84e583274b416d2f0dde3a0e6c)
@@ -21,22 +21,38 @@
     </meta>
 
     <id
-        name="nbSessionId"
+        name="uid"
         type="java.lang.Long"
-        column="nb_session_id"
+        column="uid"
+        unsaved-value="0"
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="native"
             type="java.lang.Long"
-            column="nb_session_id"
+            column="uid"
+            unsaved-value="0"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="native" />
     </id>
 
     <property
+        name="nbSessionId"
+        type="java.lang.Long"
+        column="nb_session_id"
+        not-null="true"
+        length="20"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="nb_session_id"
+            length="20"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
         name="sessionStartDate"
         type="java.sql.Timestamp"
         column="session_start_date"
@@ -75,18 +91,23 @@
 
     <!-- Associations -->
   
-    <!-- bi-directional many-to-one association to TlLanb11Content -->
+    <!-- bi-directional many-to-one association to NoticeboardContent -->
     <many-to-one
         name="nbContent"
         class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent"
         not-null="true"
+        cascade="none"
+        outer-join="auto"
+        update="true"
+        insert="true"
+        access="property"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
-           @hibernate.column name="nb_content_id"         
+           @hibernate.column name="nb_content_uid"         
         </meta>
-        <column name="nb_content_id" />
+        <column name="nb_content_uid" />
     </many-to-one>
 
 </class>