Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
===================================================================
diff -u -ra94de5ff6e0fa1bf65e068d94c81ccdd232c06df -r2b4b4fd3565396f60d9436cd3da79551e015bbaf
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision a94de5ff6e0fa1bf65e068d94c81ccdd232c06df)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 2b4b4fd3565396f60d9436cd3da79551e015bbaf)
@@ -6,7 +6,7 @@
 <hibernate-mapping>
 
 <class 
-    name="org.lamsfoundation.lams.tool.mc.McContent" 
+    name="org.lamsfoundation.lams.tool.mc.pojos.McContent" 
     table="tl_lamc11_content"
 >
     <id
@@ -200,7 +200,7 @@
               </key>
 
               <one-to-many
-                  class="org.lamsfoundation.lams.tool.mc.McQueContent"
+                  class="org.lamsfoundation.lams.tool.mc.pojos.McQueContent"
               />
     </set>
 
@@ -218,7 +218,7 @@
               </key>
 
               <one-to-many
-                  class="org.lamsfoundation.lams.tool.mc.McSession"
+                  class="org.lamsfoundation.lams.tool.mc.pojos.McSession"
               />
 
     </set>
@@ -236,7 +236,7 @@
               </key>
 
               <one-to-many
-                  class="org.lamsfoundation.lams.tool.mc.McUploadedFile"
+                  class="org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile"
               />
 
     </set>
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml
===================================================================
diff -u -r8742c4d01b2ac066988448e0c64d76998d5f4f5b -r2b4b4fd3565396f60d9436cd3da79551e015bbaf
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml	(.../McOptsContent.hbm.xml)	(revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml	(.../McOptsContent.hbm.xml)	(revision 2b4b4fd3565396f60d9436cd3da79551e015bbaf)
@@ -12,7 +12,7 @@
 -->
 
 <class 
-    name="org.lamsfoundation.lams.tool.mc.McOptsContent" 
+    name="org.lamsfoundation.lams.tool.mc.pojos.McOptsContent" 
     table="tl_lamc11_options_content"
 >
     <id
@@ -52,11 +52,9 @@
     
 
     <!-- Associations -->
-  
-    <!-- bi-directional many-to-one association to TlLamc11QueContent -->
     <many-to-one
         name="mcQueContent"
-        class="org.lamsfoundation.lams.tool.mc.McQueContent"
+        class="org.lamsfoundation.lams.tool.mc.pojos.McQueContent"
         not-null="true"        
         cascade="none"
         outer-join="auto"
@@ -77,7 +75,7 @@
             <column name="mc_que_option_id" />
         </key>
         <one-to-many 
-            class="org.lamsfoundation.lams.tool.mc.McUsrAttempt"
+            class="org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt"
         />
     </set>
    
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
diff -u -rb64ad6312251f1bfdbc023332751d4be9dcd82db -r2b4b4fd3565396f60d9436cd3da79551e015bbaf
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision b64ad6312251f1bfdbc023332751d4be9dcd82db)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision 2b4b4fd3565396f60d9436cd3da79551e015bbaf)
@@ -12,7 +12,7 @@
 -->
 
 <class 
-    name="org.lamsfoundation.lams.tool.mc.McQueContent" 
+    name="org.lamsfoundation.lams.tool.mc.pojos.McQueContent" 
     table="tl_lamc11_que_content"
 >
     <id
@@ -82,7 +82,7 @@
     
     <many-to-one
         name="mcContent"
-        class="org.lamsfoundation.lams.tool.mc.McContent"
+        class="org.lamsfoundation.lams.tool.mc.pojos.McContent"
         not-null="true"        
 	    cascade="none"
 	    outer-join="auto"
@@ -94,7 +94,6 @@
     </many-to-one>
     
     
-    <!-- bi-directional one-to-many association to TlLamc11OptionsContent -->
     <set
         name="mcOptionsContents"
         lazy="true"
@@ -105,7 +104,7 @@
             <column name="mc_que_content_id" />
         </key>
         <one-to-many 
-            class="org.lamsfoundation.lams.tool.mc.McOptsContent"
+            class="org.lamsfoundation.lams.tool.mc.pojos.McOptsContent"
         />
     </set>
     
@@ -121,11 +120,9 @@
             <column name="mc_que_content_id" />
         </key>
         <one-to-many 
-            class="org.lamsfoundation.lams.tool.mc.McUsrAttempt"
+            class="org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt"
         />
     </set>
     
-    
-    
 </class>
 </hibernate-mapping>
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r2b4b4fd3565396f60d9436cd3da79551e015bbaf
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	(.../McQueUsr.hbm.xml)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	(.../McQueUsr.hbm.xml)	(revision 2b4b4fd3565396f60d9436cd3da79551e015bbaf)
@@ -6,7 +6,7 @@
 <hibernate-mapping>
 
 <class 
-    name="org.lamsfoundation.lams.tool.mc.McQueUsr" 
+    name="org.lamsfoundation.lams.tool.mc.pojos.McQueUsr" 
     table="tl_lamc11_que_usr"
 >
     <id
@@ -42,9 +42,21 @@
     >
     </property>
 
+    <property
+        name="mcSessionId"
+        type="java.lang.Long"
+        update="false"
+        insert="false"
+        access="property"
+        column="mc_session_id"
+        length="20"
+    >
+    </property>
+
+
     <many-to-one
         name="mcSession"
-        class="org.lamsfoundation.lams.tool.mc.McSession"
+        class="org.lamsfoundation.lams.tool.mc.pojos.McSession"
         not-null="true"        
         cascade="none"
         outer-join="auto"
@@ -68,7 +80,7 @@
               </key>
 
               <one-to-many
-                  class="org.lamsfoundation.lams.tool.mc.McUsrAttempt"
+                  class="org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt"
               />
     </set>
 
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r2b4b4fd3565396f60d9436cd3da79551e015bbaf
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml	(.../McSession.hbm.xml)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml	(.../McSession.hbm.xml)	(revision 2b4b4fd3565396f60d9436cd3da79551e015bbaf)
@@ -5,7 +5,7 @@
 
 <hibernate-mapping>
 <class 
-    name="org.lamsfoundation.lams.tool.mc.McSession" 
+    name="org.lamsfoundation.lams.tool.mc.pojos.McSession" 
     table="tl_lamc11_session"
 >
     <id
@@ -61,7 +61,7 @@
 
    <many-to-one
         name="mcContent"
-        class="org.lamsfoundation.lams.tool.mc.McContent"
+        class="org.lamsfoundation.lams.tool.mc.pojos.McContent"
         not-null="true"        
         cascade="none"
         outer-join="auto"
@@ -85,10 +85,9 @@
         	<column name="mc_session_id" />
    		</key>
         <one-to-many 
-            class="org.lamsfoundation.lams.tool.mc.McQueUsr"
+            class="org.lamsfoundation.lams.tool.mc.pojos.McQueUsr"
         />
     </set>
-    
 
 </class>
 </hibernate-mapping>
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml
===================================================================
diff -u -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc -r2b4b4fd3565396f60d9436cd3da79551e015bbaf
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml	(.../McUploadedFile.hbm.xml)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml	(.../McUploadedFile.hbm.xml)	(revision 2b4b4fd3565396f60d9436cd3da79551e015bbaf)
@@ -6,7 +6,7 @@
 <hibernate-mapping>
 
 <class 
-    name="org.lamsfoundation.lams.tool.mc.McUploadedFile" 
+    name="org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile" 
     table="tl_lamc11_uploadedfile"
 >
     <id
@@ -53,7 +53,7 @@
     
    <many-to-one
         name="mcContent"
-        class="org.lamsfoundation.lams.tool.mc.McContent"
+        class="org.lamsfoundation.lams.tool.mc.pojos.McContent"
         not-null="true"        
         cascade="none"
         outer-join="auto"
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml
===================================================================
diff -u -r6f1188b57dfc1cd53bfbeb95fcdb295f1d2bf2e6 -r2b4b4fd3565396f60d9436cd3da79551e015bbaf
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml	(.../McUsrAttempt.hbm.xml)	(revision 6f1188b57dfc1cd53bfbeb95fcdb295f1d2bf2e6)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml	(.../McUsrAttempt.hbm.xml)	(revision 2b4b4fd3565396f60d9436cd3da79551e015bbaf)
@@ -6,7 +6,7 @@
 <hibernate-mapping>
 
 <class 
-    name="org.lamsfoundation.lams.tool.mc.McUsrAttempt" 
+    name="org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt" 
     table="tl_lamc11_usr_attempt"
 >
     <id
@@ -92,7 +92,7 @@
 
     <many-to-one
         name="mcQueContent"
-        class="org.lamsfoundation.lams.tool.mc.McQueContent"
+        class="org.lamsfoundation.lams.tool.mc.pojos.McQueContent"
         not-null="true"        
    	    cascade="none"
 	    outer-join="auto"
@@ -105,7 +105,7 @@
     
     <many-to-one
         name="mcQueUsr"
-        class="org.lamsfoundation.lams.tool.mc.McQueUsr"
+        class="org.lamsfoundation.lams.tool.mc.pojos.McQueUsr"
         not-null="true"        
 	    cascade="none"
 	    outer-join="auto"
@@ -118,7 +118,7 @@
     
     <many-to-one
         name="mcOptionsContent"
-        class="org.lamsfoundation.lams.tool.mc.McOptsContent"
+        class="org.lamsfoundation.lams.tool.mc.pojos.McOptsContent"
         not-null="true"                
 	    cascade="none"
 	    outer-join="auto"