Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java
===================================================================
diff -u -ra212ebcd0dd7e3ef46b7ee2e1369f7430b9e497e -r453f2eba48028eae64432e141884df0830804909
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java	(.../NoticeboardContent.java)	(revision a212ebcd0dd7e3ef46b7ee2e1369f7430b9e497e)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java	(.../NoticeboardContent.java)	(revision 453f2eba48028eae64432e141884df0830804909)
@@ -23,7 +23,7 @@
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
-import java.util.TreeSet;
+import java.util.HashSet;
 
 /**
  * Persistent noticeboard object/bean that defines the content for the noticeboard tool.
@@ -34,6 +34,9 @@
 public class NoticeboardContent implements Serializable {
 	
 	/** identifier field */
+    private Long uid;
+    
+    /** non-nullable persistent field */
 	private Long nbContentId;
 	
 	/** nullable persistent field */
@@ -81,8 +84,7 @@
 							  boolean forceOffline,
 							  Long creatorUserId,
 							  Date dateCreated,
-							  Date dateUpdated,
-							  Set nbSessions)
+							  Date dateUpdated)
 	{
 		this.nbContentId = nbContentId;
 		this.title = title;
@@ -94,7 +96,6 @@
 		this.creatorUserId = creatorUserId;
 		this.dateCreated = dateCreated;
 		this.dateUpdated = dateUpdated;
-		this.nbSessions = nbSessions;
 	}
 	
 	/**
@@ -119,10 +120,10 @@
 		this.creatorUserId = null;
 		this.dateCreated = dateCreated;
 		this.dateUpdated = null;
-		this.nbSessions = new TreeSet();
 	}
 	
 	
+    
 	/**
 	 *		 @hibernate.property
      *       column="content"
@@ -207,11 +208,10 @@
 	
 	
 	/** 
-	 *		@hibernate.id
-     *      generator-class="assigned"
-     *      type="java.lang.Long"
+	 *		@hibernate.property
      *      column="nb_content_id"
-     * 
+     *      length="20"
+     *      not-null="true"
      */
 	
 	public Long getNbContentId() {
@@ -234,7 +234,7 @@
 	public Set getNbSessions() {
 		if (this.nbSessions == null)
 		{
-			setNbSessions(new TreeSet());
+			setNbSessions(new HashSet());
 		}
 		return nbSessions;
 	}
@@ -284,6 +284,23 @@
 		this.title = title;
 	}
 	
+	 /**
+      * 	@hibernate.id
+      *     generator-class="native"
+      *     type="java.lang.Long"
+      *     column="uid"
+      *     unsaved-value="0"
+      */
+    public Long getUid() {
+        return uid;
+    }
+    
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+	
+	
+	
 	/** 
 	 * 
 	 * @param nb			NoticeboardContent object containing the content to copy from
@@ -301,8 +318,8 @@
 														nb.isForceOffline(),
 														nb.getCreatorUserId(),
 														nb.getDateCreated(),
-														nb.getDateUpdated(),
-														new TreeSet());
+														nb.getDateUpdated());
 		return newContent;
 	}
+   
 }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.java
===================================================================
diff -u -ref70f082a2d4ce2ef49f517d1f962cf4130be034 -r453f2eba48028eae64432e141884df0830804909
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.java	(.../NoticeboardSession.java)	(revision ef70f082a2d4ce2ef49f517d1f962cf4130be034)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.java	(.../NoticeboardSession.java)	(revision 453f2eba48028eae64432e141884df0830804909)
@@ -39,12 +39,12 @@
     public static final String COMPLETED = "COMPLETED";
     
 	/** identifier field */
+    private Long uid;
+    
+    /** persistent field*/
 	private Long nbSessionId;
 	
-	/** persistent field */
-//	private Long nbContentId;
-	
-	/** nullable persistent field */
+  	/** nullable persistent field */
 	private Date sessionStartDate;
 		
 	/** nullable persistent field */
@@ -106,21 +106,12 @@
 	public void setNbContent(NoticeboardContent nbContent) {
 		this.nbContent = nbContent;
 	}
-	
-	/*
-	public Long getNbContentId() {
-		return nbContentId;
-	}
-
-	public void setNbContentId(Long nbContentId) {
-		this.nbContentId = nbContentId;
-	}*/
-	
+		
 	/**
-	 *		@hibernate.id
-     *  	generator-class="assigned"
-     *      type="java.lang.Long"
+	 *		@hibernate.property
      *      column="nb_session_id"
+     *      length="20"
+     *      not-null="true"
 	 */
 	public Long getNbSessionId() {
 		return nbSessionId;
@@ -168,4 +159,20 @@
 	public void setSessionStatus(String sessionStatus) {
 		this.sessionStatus = sessionStatus;
 	}
+	
+	/**
+     *	  	@hibernate.id
+     *      generator-class="native"
+     *      type="java.lang.Long"
+     *      column="uid"
+     *      unsaved-value="0"
+     */
+    public Long getUid() {
+        return uid;
+    }
+    
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+	
 }