Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.java
===================================================================
diff -u -r14ddf81e81af986fb804ec0fbf3d114f8b685898 -rd39d7edcb03ad77fe0ce33346882381c6128ba37
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.java	(.../NoticeboardAttachment.java)	(revision 14ddf81e81af986fb804ec0fbf3d114f8b685898)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.java	(.../NoticeboardAttachment.java)	(revision d39d7edcb03ad77fe0ce33346882381c6128ba37)
@@ -39,7 +39,7 @@
  * in the content repository, however, the file details will be stored in the
  * tl_lanb11_attachment table. The file uploaded, will be of two types: online or offline.
  * </p>
- * 
+ * @hibernate.class table="tl_lanb11_attachment"
  * @author mtruong
  */
 public class NoticeboardAttachment implements Serializable, Cloneable {
@@ -109,6 +109,11 @@
 	}    
 
     /**
+     * @hibernate.id 
+     * 		generator-class="native" 
+     * 		type="java.lang.Long" 
+     * 		column="attachment_id"
+     * 
      * @return Returns the attachmentId.
      */
     public Long getAttachmentId() {
@@ -123,6 +128,11 @@
     }
     
     /**
+     * @hibernate.property 
+     * 		column="filename" 
+     * 		length="255" 
+     * 		not-null="true"
+     * 
      * @return Returns the filename.
      */
     public String getFilename() {
@@ -136,6 +146,11 @@
     }
    
     /**
+     * @hibernate.property 
+     * 		column="online_file" 
+     * 		length="1" 
+     * 		not-null="true"
+     * 
      * @return Returns the isOnline.
      */
     public boolean isOnlineFile() {
@@ -149,6 +164,12 @@
     }
    
     /**
+     * @hibernate.many-to-one 
+     * 		not-null="true" 
+     * 
+     * @hibernate.column 
+     * 		name="nb_content_uid"
+     * 
      * @return Returns the nbContent.
      */
     public NoticeboardContent getNbContent() {
@@ -162,6 +183,11 @@
     }
    
     /**
+     * @hibernate.property 
+     * 		column="uuid" 
+     * 		not-null="true" 
+     * 		length="20"
+     * 
      * @return Returns the uuid.
      */
     public Long getUuid() {
@@ -175,6 +201,10 @@
     }
    
     /**
+     * @hibernate.property 
+     * 		column="version_id" 
+     * 		length="20"
+     * 
      * @return Returns the versionId.
      */
     public Long getVersionId() { //nullable
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java
===================================================================
diff -u -r14ddf81e81af986fb804ec0fbf3d114f8b685898 -rd39d7edcb03ad77fe0ce33346882381c6128ba37
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java	(.../NoticeboardContent.java)	(revision 14ddf81e81af986fb804ec0fbf3d114f8b685898)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java	(.../NoticeboardContent.java)	(revision d39d7edcb03ad77fe0ce33346882381c6128ba37)
@@ -35,7 +35,7 @@
 /**
  * <p>Persistent noticeboard object/bean that defines the content for the noticeboard tool.
  * Provides accessors and mutators to get/set noticeboard attributes</p>
- * 
+ * @hibernate.class table="tl_lanb11_content"
  * @author mtruong
  */
 public class NoticeboardContent implements Serializable {
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.java
===================================================================
diff -u -r4ad2abe31665fbf411e55a8c150447fa80cac3d6 -rd39d7edcb03ad77fe0ce33346882381c6128ba37
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.java	(.../NoticeboardSession.java)	(revision 4ad2abe31665fbf411e55a8c150447fa80cac3d6)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.java	(.../NoticeboardSession.java)	(revision d39d7edcb03ad77fe0ce33346882381c6128ba37)
@@ -38,6 +38,7 @@
  * <li>COMPLETED: The session status will never be set to complete as you don't know when this tool is going to end.
  * </ul></p>
  * @author mtruong
+ * @hibernate.class table="tl_lanb11_session"
  */
 
 public class NoticeboardSession implements Serializable {
@@ -144,7 +145,7 @@
 	/**
 	 * 		@hibernate.many-to-one
      *      not-null="true"
-     *      @hibernate.column name="nb_content_id" 
+     *      @hibernate.column name="nb_content_uid" 
 	 */
 	public NoticeboardContent getNbContent() {
 		return nbContent;
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.java
===================================================================
diff -u -rc37fcfa0e8e9c09a5ada45fba5af63e43b2bbef1 -rd39d7edcb03ad77fe0ce33346882381c6128ba37
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.java	(.../NoticeboardUser.java)	(revision c37fcfa0e8e9c09a5ada45fba5af63e43b2bbef1)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.java	(.../NoticeboardUser.java)	(revision d39d7edcb03ad77fe0ce33346882381c6128ba37)
@@ -26,6 +26,7 @@
  */
 
 /**
+ * @hibernate.class table="tl_lanb11_user"
  * @author mtruong
  *
  * <p>The NoticeboardUser class represents the learners that will participate
@@ -85,6 +86,10 @@
     }
     
     /**
+     * @hibernate.property 
+     * 		column="fullname" 
+     * 		length="50"
+     * 
      * @return Returns the fullname.
      */
     public String getFullname() {
@@ -97,6 +102,11 @@
         this.fullname = fullname;
     }
     /**
+     * @hibernate.many-to-one 
+     * 		not-null="true" 
+     * @hibernate.column 
+     * 		name="nb_session_uid"
+     * 
      * @return Returns the nbSession.
      */
     public NoticeboardSession getNbSession() {
@@ -109,6 +119,11 @@
         this.nbSession = nbSession;
     }
     /**
+     * @hibernate.id 
+     * 		generator-class="native" 
+     * 		type="java.lang.Long" 
+     * 		column="uid"
+     * 
      * @return Returns the uid.
      */
     public Long getUid() {
@@ -121,6 +136,11 @@
         this.uid = uid;
     }
     /**
+     * @hibernate.property 
+     * 		column="user_id" 
+     * 		length="20" 
+     * 		not-null="true"
+     * 
      * @return Returns the userId.
      */
     public Long getUserId() {
@@ -133,6 +153,10 @@
         this.userId = userId;
     }
     /**
+     * @hibernate.property 
+     * 		column="username" 
+     * 		length="50"
+     * 
      * @return Returns the username.
      */
     public String getUsername() {
@@ -145,6 +169,10 @@
         this.username = username;
     }
     /**
+     * @hibernate.property 
+     * 		column="user_status" 
+     * 		length="50"
+     * 
      * @return Returns the userStatus.
      */
     public String getUserStatus() {