Index: lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml
===================================================================
diff -u -r1d4d39bc99bceeb2f3400228a83823b8cd67c6da -r91ab70504f55283e714dfb30794c656b33feeac7
--- lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml	(.../Notebook.hbm.xml)	(revision 1d4d39bc99bceeb2f3400228a83823b8cd67c6da)
+++ lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml	(.../Notebook.hbm.xml)	(revision 91ab70504f55283e714dfb30794c656b33feeac7)
@@ -70,7 +70,7 @@
 
         <property
             name="runOffline"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="run_offline"
@@ -79,7 +79,7 @@
 
         <property
             name="lockOnFinished"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="lock_on_finished"
@@ -88,7 +88,7 @@
 
         <property
             name="allowRichEditor"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="allow_rich_editor"
@@ -115,7 +115,7 @@
 
         <property
             name="contentInUse"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="content_in_use"
@@ -124,7 +124,7 @@
 
         <property
             name="defineLater"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="define_later"
@@ -142,7 +142,7 @@
 
         <set
             name="notebookAttachments"
-            lazy="false"
+            lazy="true"
             inverse="false"
             cascade="all-delete-orphan"
             sort="unsorted"
Index: lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml
===================================================================
diff -u -r58cfe8c94ee9878fc43820e4f0ae4d1f8a1df35a -r91ab70504f55283e714dfb30794c656b33feeac7
--- lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml	(.../NotebookUser.hbm.xml)	(revision 58cfe8c94ee9878fc43820e4f0ae4d1f8a1df35a)
+++ lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml	(.../NotebookUser.hbm.xml)	(revision 91ab70504f55283e714dfb30794c656b33feeac7)
@@ -63,7 +63,7 @@
 
         <property
             name="finishedActivity"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="finishedActivity"
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java
===================================================================
diff -u -rda54b82e5ef860fe9f8872b75f2b1718cfb7de32 -r91ab70504f55283e714dfb30794c656b33feeac7
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java	(.../Notebook.java)	(revision da54b82e5ef860fe9f8872b75f2b1718cfb7de32)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java	(.../Notebook.java)	(revision 91ab70504f55283e714dfb30794c656b33feeac7)
@@ -297,7 +297,7 @@
 	}
 
 	/**
-	 * @hibernate.set lazy="false" inverse="false" cascade="all-delete-orphan"
+	 * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan"
 	 * @hibernate.collection-key column="notebook_uid"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.notebook.model.NotebookAttachment"
 	 * 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookAttachment.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r91ab70504f55283e714dfb30794c656b33feeac7
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookAttachment.java	(.../NotebookAttachment.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookAttachment.java	(.../NotebookAttachment.java)	(revision 91ab70504f55283e714dfb30794c656b33feeac7)
@@ -72,15 +72,13 @@
 	public NotebookAttachment() {
 	}
 
-	/** full constructor */
-	public NotebookAttachment(Long fileVersionId, String fileType, String fileName,
-			Long fileUuid, Date createDate, Notebook notebook) {
+	/** Constructor setting up all the properties except for notebook one*/
+	public NotebookAttachment(Long fileVersionId, String fileType, String fileName,	Long fileUuid, Date createDate) {
 		this.fileVersionId = fileVersionId;
 		this.fileType = fileType;
 		this.fileName = fileName;
 		this.fileUuid = fileUuid;
 		this.createDate = createDate;
-		this.notebook = notebook;
 	}
 
 	// Property accessors
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
diff -u -r97612142f4697066beb66064e83ff31fef1712b9 -r91ab70504f55283e714dfb30794c656b33feeac7
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 97612142f4697066beb66064e83ff31fef1712b9)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 91ab70504f55283e714dfb30794c656b33feeac7)
@@ -414,12 +414,7 @@
 
 		NodeKey nodeKey = processFile(file, type);
 
-		NotebookAttachment attachment = new NotebookAttachment();
-		attachment.setFileType(type);
-		attachment.setFileUuid(nodeKey.getUuid());
-		attachment.setFileVersionId(nodeKey.getVersion());
-		attachment.setFileName(file.getFileName());
-
+		NotebookAttachment attachment = new NotebookAttachment(nodeKey.getVersion(), type, file.getFileName(), nodeKey.getUuid(), new Date());
 		return attachment;
 	}