Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
diff -u -rb610cde22bca23f3ec2c70121db08612edff3912 -r16209fa3982303b4f822717f45e72d490edaef99
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision b610cde22bca23f3ec2c70121db08612edff3912)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision 16209fa3982303b4f822717f45e72d490edaef99)
@@ -9,10 +9,6 @@
     <class
         name="org.lamsfoundation.lams.tool.sbmt.SubmissionDetails"
         table="tl_lasbmt11_submission_details"
-        dynamic-update="false"
-        dynamic-insert="false"
-        select-before-update="false"
-        optimistic-lock="version"
     >
 
         <id
@@ -34,7 +30,6 @@
             type="java.lang.String"
             update="true"
             insert="true"
-            access="property"
             column="filePath"
             length="250"
         />
@@ -44,7 +39,6 @@
             type="java.lang.String"
             update="true"
             insert="true"
-            access="property"
             column="fileDescription"
             length="250"
         />
@@ -54,7 +48,6 @@
             type="java.util.Date"
             update="true"
             insert="true"
-            access="property"
             column="date_of_submission"
             length="19"
         />
@@ -64,7 +57,6 @@
             type="java.lang.Long"
             update="true"
             insert="true"
-            access="property"
             column="uuid"
             length="20"
         />
@@ -74,35 +66,38 @@
             type="java.lang.Long"
             update="true"
             insert="true"
-            access="property"
             column="version_id"
             length="20"
         />
 
-        <many-to-one
+        <one-to-one
             name="report"
             class="org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport"
-            cascade="none"
+            cascade="all"
             outer-join="auto"
-            update="true"
-            insert="true"
-            access="property"
-        >
-            <column
-                name="report_id" 
-            />
-        </many-to-one>
+            constrained="false"
+            foreign-key="report_id"
+        />
 
         <property
             name="userID"
             type="java.lang.Long"
             update="true"
             insert="true"
-            access="property"
             column="user_id"
             length="20"
         />
 
+        <many-to-one
+            name="submitFileSession"
+            class="org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession"
+            cascade="save-update"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="session_id"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SubmissionDetails.xml
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -rb610cde22bca23f3ec2c70121db08612edff3912 -r16209fa3982303b4f822717f45e72d490edaef99
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision b610cde22bca23f3ec2c70121db08612edff3912)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 16209fa3982303b4f822717f45e72d490edaef99)
@@ -9,10 +9,6 @@
     <class
         name="org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent"
         table="tl_lasbmt11_content"
-        dynamic-update="false"
-        dynamic-insert="false"
-        select-before-update="false"
-        optimistic-lock="version"
     >
 
         <id
@@ -34,7 +30,6 @@
             type="java.lang.String"
             update="true"
             insert="true"
-            access="property"
             column="title"
             length="64"
             not-null="true"
@@ -45,7 +40,6 @@
             type="java.lang.String"
             update="true"
             insert="true"
-            access="property"
             column="instructions"
             length="64"
         />
@@ -58,14 +52,14 @@
             sort="unsorted"
         >
 
-              <key
-                  column="content_id"
-              >
-              </key>
+            <key
+                column="content_id"
+            >
+            </key>
 
-              <one-to-many
+            <one-to-many
                   class="org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession"
-              />
+            />
 
         </set>
 
@@ -74,7 +68,6 @@
             type="boolean"
             update="true"
             insert="true"
-            access="property"
             column="defineLater"
             length="1"
         />
@@ -84,7 +77,6 @@
             type="boolean"
             update="true"
             insert="true"
-            access="property"
             column="runOffline"
             length="1"
         />
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
diff -u -rb610cde22bca23f3ec2c70121db08612edff3912 -r16209fa3982303b4f822717f45e72d490edaef99
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	(.../SubmitFilesReport.hbm.xml)	(revision b610cde22bca23f3ec2c70121db08612edff3912)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	(.../SubmitFilesReport.hbm.xml)	(revision 16209fa3982303b4f822717f45e72d490edaef99)
@@ -9,10 +9,6 @@
     <class
         name="org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport"
         table="tl_lasbmt11_report"
-        dynamic-update="false"
-        dynamic-insert="false"
-        select-before-update="false"
-        optimistic-lock="version"
     >
 
         <id
@@ -34,7 +30,6 @@
             type="java.lang.String"
             update="true"
             insert="true"
-            access="property"
             column="comments"
             length="250"
         />
@@ -44,7 +39,6 @@
             type="java.lang.Long"
             update="true"
             insert="true"
-            access="property"
             column="marks"
             length="20"
         />
@@ -54,7 +48,6 @@
             type="java.util.Date"
             update="true"
             insert="true"
-            access="property"
             column="date_marks_released"
             length="19"
         />
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
===================================================================
diff -u -rdf1375bbde992f59d04ee895a971eb4dfa7282b1 -r16209fa3982303b4f822717f45e72d490edaef99
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision df1375bbde992f59d04ee895a971eb4dfa7282b1)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 16209fa3982303b4f822717f45e72d490edaef99)
@@ -9,10 +9,6 @@
     <class
         name="org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession"
         table="tl_lasbmt11_session"
-        dynamic-update="false"
-        dynamic-insert="false"
-        select-before-update="false"
-        optimistic-lock="version"
     >
 
         <id
@@ -34,7 +30,6 @@
             type="java.lang.Integer"
             update="true"
             insert="true"
-            access="property"
             column="status"
             length="11"
             not-null="true"
@@ -43,19 +38,19 @@
         <set
             name="submissionDetails"
             lazy="true"
-            inverse="false"
+            inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
         >
 
-              <key
-                  column="session_id"
-              >
-              </key>
+            <key
+                column="session_id"
+            >
+            </key>
 
-              <one-to-many
+            <one-to-many
                   class="org.lamsfoundation.lams.tool.sbmt.SubmissionDetails"
-              />
+            />
 
         </set>
 
Index: lams_tool_sbmt/db/sql/table-schema.sql
===================================================================
diff -u -rdf1375bbde992f59d04ee895a971eb4dfa7282b1 -r16209fa3982303b4f822717f45e72d490edaef99
--- lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision df1375bbde992f59d04ee895a971eb4dfa7282b1)
+++ lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 16209fa3982303b4f822717f45e72d490edaef99)
@@ -1,5 +1,4 @@
 alter table tl_lasbmt11_submission_details drop foreign key FK1411A53C630DDF64;
-alter table tl_lasbmt11_submission_details drop foreign key FK1411A53CEAF0A006;
 drop table if exists tl_lasbmt11_report;
 drop table if exists tl_lasbmt11_content;
 drop table if exists tl_lasbmt11_submission_details;
@@ -26,7 +25,6 @@
    date_of_submission datetime,
    uuid bigint,
    version_id bigint,
-   report_id bigint,
    user_id bigint,
    session_id bigint,
    primary key (submission_id)
@@ -38,4 +36,3 @@
    primary key (session_id)
 );
 alter table tl_lasbmt11_submission_details add index FK1411A53C630DDF64 (session_id), add constraint FK1411A53C630DDF64 foreign key (session_id) references tl_lasbmt11_session (session_id);
-alter table tl_lasbmt11_submission_details add index FK1411A53CEAF0A006 (report_id), add constraint FK1411A53CEAF0A006 foreign key (report_id) references tl_lasbmt11_report (report_id);