Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml
===================================================================
diff -u -ra4b21fc560d5ed7df551c48f3afeab20e136b499 -r9bd4f4267cad09173c138a31081aa5f9103bfc74
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision a4b21fc560d5ed7df551c48f3afeab20e136b499)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 9bd4f4267cad09173c138a31081aa5f9103bfc74)
@@ -15,7 +15,7 @@
         type="java.lang.Long"
         column="submissionId"
     >
-	    <generator class="increment"/>
+	    <generator class="native"/>
     </id>
 
 
@@ -41,15 +41,6 @@
             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/web/WEB-INF/QaContent.hbm.xml
===================================================================
diff -u -r673efe2cf1287003e7962dca49626c1ebe8ae9e1 -r9bd4f4267cad09173c138a31081aa5f9103bfc74
--- lams_tool_laqa/web/WEB-INF/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 673efe2cf1287003e7962dca49626c1ebe8ae9e1)
+++ lams_tool_laqa/web/WEB-INF/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 9bd4f4267cad09173c138a31081aa5f9103bfc74)
@@ -33,37 +33,45 @@
         type="java.lang.String"
         access="property"
         column="title"
-        length="100"
+        length="65535"
     />
 
     <property
         name="instructions"
         type="java.lang.String"
         access="property"        
         column="instructions"
-        length="255"
+        length="65535"
     />
+    
+    <property
+        name="reflectionSubject"
+        type="java.lang.String"
+        access="property"        
+        column="reflectionSubject"
+        length="65535"
+    />
 
 
    <property
-            name="defineLater"
-            type="boolean"
-            access="property"
-            column="define_later"
+        name="defineLater"
+        type="boolean"
+        access="property"
+        column="define_later"
    />
 
 
    <property
-            name="runOffline"
-            type="boolean"
-            access="property"
-            column="run_offline"
+        name="runOffline"
+        type="boolean"
+        access="property"
+        column="run_offline"
    />
 
 
     <property
         name="creationDate"
-        type="java.lang.String"
+        type="java.util.Date"
         access="property"        
         column="creation_date"
         length="10"
@@ -80,11 +88,20 @@
 
 
    <property
-            name="questionsSequenced"
-            type="boolean"
-            access="property"
-            column="questions_sequenced"
+        name="questionsSequenced"
+        type="boolean"
+        access="property"
+        column="questions_sequenced"
    />
+   
+   <property
+        name="reflect"
+        type="boolean"
+        access="property"
+        column="reflect"
+        length="1"        
+   />
+   
 
     <property
         name="usernameVisible"
@@ -133,7 +150,7 @@
         name="contentLocked"
         type="boolean"
         access="property"        
-        column="content_locked"
+        column="content_inUse"
         length="1"
     />
     
@@ -155,14 +172,6 @@
         length="65535"
     />
     
-    <property
-        name="endLearningMessage"
-        type="java.lang.String"
-        access="property"        
-        column="end_learning_message"
-        length="65535"
-    />
-    
 
    	 <set
             name="qaQueContents"
Index: lams_tool_laqa/web/WEB-INF/QaQueContent.hbm.xml
===================================================================
diff -u -r673efe2cf1287003e7962dca49626c1ebe8ae9e1 -r9bd4f4267cad09173c138a31081aa5f9103bfc74
--- lams_tool_laqa/web/WEB-INF/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 673efe2cf1287003e7962dca49626c1ebe8ae9e1)
+++ lams_tool_laqa/web/WEB-INF/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 9bd4f4267cad09173c138a31081aa5f9103bfc74)
@@ -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/web/WEB-INF/QaQueUsr.hbm.xml
===================================================================
diff -u -r673efe2cf1287003e7962dca49626c1ebe8ae9e1 -r9bd4f4267cad09173c138a31081aa5f9103bfc74
--- lams_tool_laqa/web/WEB-INF/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 673efe2cf1287003e7962dca49626c1ebe8ae9e1)
+++ lams_tool_laqa/web/WEB-INF/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 9bd4f4267cad09173c138a31081aa5f9103bfc74)
@@ -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/web/WEB-INF/QaSession.hbm.xml
===================================================================
diff -u -r673efe2cf1287003e7962dca49626c1ebe8ae9e1 -r9bd4f4267cad09173c138a31081aa5f9103bfc74
--- lams_tool_laqa/web/WEB-INF/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 673efe2cf1287003e7962dca49626c1ebe8ae9e1)
+++ lams_tool_laqa/web/WEB-INF/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 9bd4f4267cad09173c138a31081aa5f9103bfc74)
@@ -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/web/WEB-INF/QaUploadedFile.hbm.xml
===================================================================
diff -u -r673efe2cf1287003e7962dca49626c1ebe8ae9e1 -r9bd4f4267cad09173c138a31081aa5f9103bfc74
--- lams_tool_laqa/web/WEB-INF/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 673efe2cf1287003e7962dca49626c1ebe8ae9e1)
+++ lams_tool_laqa/web/WEB-INF/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 9bd4f4267cad09173c138a31081aa5f9103bfc74)
@@ -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/web/WEB-INF/QaUsrResp.hbm.xml
===================================================================
diff -u -r673efe2cf1287003e7962dca49626c1ebe8ae9e1 -r9bd4f4267cad09173c138a31081aa5f9103bfc74
--- lams_tool_laqa/web/WEB-INF/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 673efe2cf1287003e7962dca49626c1ebe8ae9e1)
+++ lams_tool_laqa/web/WEB-INF/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 9bd4f4267cad09173c138a31081aa5f9103bfc74)
@@ -40,6 +40,14 @@
         length="10"
     >
     </property>
+    
+   <property
+        name="visible"
+        type="boolean"
+        access="property"
+        column="visible"
+        length="1"        
+   />
 
     <property
         name="timezone"