Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
===================================================================
diff -u -r2c5c7c68e66e26cef44208bc922b056e3bfb1dd6 -r55e3c6296643b4bb2f3d94ad11951ef89052ee78
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 2c5c7c68e66e26cef44208bc922b056e3bfb1dd6)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 55e3c6296643b4bb2f3d94ad11951ef89052ee78)
@@ -26,15 +26,24 @@
             length="65535"
         />
 
-        <property
-            name="displayOrder"
-            type="int"
-            access="property"
-            column="display_order"
-            length="11"
-        />
+	    <property
+	        name="displayOrder"
+	        type="java.lang.Integer"
+	        column="display_order"
+	        length="5"
+	    >
+	    </property>
 
+	    <property
+	        name="feedback"
+	        type="java.lang.String"
+	        access="property"
+	        column="feedback"
+	        length="65535"
+	    />
+    
 
+
         <property
             name="qaContentId"
             type="java.lang.Long"
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
===================================================================
diff -u -r2c5c7c68e66e26cef44208bc922b056e3bfb1dd6 -r55e3c6296643b4bb2f3d94ad11951ef89052ee78
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 2c5c7c68e66e26cef44208bc922b056e3bfb1dd6)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 55e3c6296643b4bb2f3d94ad11951ef89052ee78)
@@ -41,7 +41,21 @@
         length="100"
     >
     </property>
+    
+   <property
+            name="responseFinalized"
+            type="boolean"
+            access="property"
+            column="responseFinalized"
+   />
 
+   <property
+            name="learnerFinished"
+            type="boolean"
+            access="property"
+            column="learnerFinished"
+   />
+
     <property
         name="qaSessionId"
         type="java.lang.Long"
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml
===================================================================
diff -u -r2c5c7c68e66e26cef44208bc922b056e3bfb1dd6 -r55e3c6296643b4bb2f3d94ad11951ef89052ee78
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 2c5c7c68e66e26cef44208bc922b056e3bfb1dd6)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 55e3c6296643b4bb2f3d94ad11951ef89052ee78)
@@ -51,6 +51,14 @@
         column="session_status"
         length="100"
     />
+
+    <property
+        name="session_name"
+        type="java.lang.String"
+        access="property"
+        column="session_name"
+        length="100"
+    />
     
     <property
         name="qaContentId"
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml
===================================================================
diff -u -r2c5c7c68e66e26cef44208bc922b056e3bfb1dd6 -r55e3c6296643b4bb2f3d94ad11951ef89052ee78
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 2c5c7c68e66e26cef44208bc922b056e3bfb1dd6)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 55e3c6296643b4bb2f3d94ad11951ef89052ee78)
@@ -15,7 +15,7 @@
         type="java.lang.Long"
         column="submissionId"
     >
-	    <generator class="increment"/>
+	    <generator class="native"/>
     </id>
 
 
@@ -38,18 +38,9 @@
             name="fileName"
             type="java.lang.String"
             access="property"
-            column="fileName"
+            column="filename"
    />
    
-       <!--  property
-        name="qaContentId"
-        type="java.lang.Long"
-        update="false"
-        insert="false"
-        access="property"
-        column="qa_content_id"
-        length="20"
-    / -->
    
 
    <many-to-one
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
===================================================================
diff -u -r2c5c7c68e66e26cef44208bc922b056e3bfb1dd6 -r55e3c6296643b4bb2f3d94ad11951ef89052ee78
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 2c5c7c68e66e26cef44208bc922b056e3bfb1dd6)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 55e3c6296643b4bb2f3d94ad11951ef89052ee78)
@@ -40,6 +40,14 @@
         length="10"
     >
     </property>
+    
+   <property
+        name="visible"
+        type="boolean"
+        access="property"
+        column="visible"
+        length="1"        
+   />
 
     <property
         name="timezone"