Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
===================================================================
diff -u -r25a3cd766f44f20c25042ad630f87b5b79a53671 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 25a3cd766f44f20c25042ad630f87b5b79a53671)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -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
@@ -188,6 +188,7 @@
     
    	 <set
             name="mcQueContents"
+            order-by="display_order"
             lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
@@ -199,7 +200,7 @@
               </key>
 
               <one-to-many
-                  class="org.lamsfoundation.lams.tool.mc.McQueContent"
+                  class="org.lamsfoundation.lams.tool.mc.pojos.McQueContent"
               />
     </set>
 
@@ -217,11 +218,29 @@
               </key>
 
               <one-to-many
-                  class="org.lamsfoundation.lams.tool.mc.McSession"
+                  class="org.lamsfoundation.lams.tool.mc.pojos.McSession"
               />
 
     </set>
+    
+    	<set
+            name="mcAttachments"
+            lazy="true"
+            inverse="true"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+        >
+              <key
+                  column="mc_content_id"
+              >
+              </key>
 
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile"
+              />
 
+    </set>
+
+
 </class>
 </hibernate-mapping>
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java
===================================================================
diff -u -rb729587d2ebffa80f02239e91bc80352869d311a -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	(.../McDataAccessTestCase.java)	(revision b729587d2ebffa80f02239e91bc80352869d311a)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	(.../McDataAccessTestCase.java)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -9,6 +9,10 @@
 import org.lamsfoundation.lams.tool.mc.dao.hibernate.McSessionDAO;
 import org.lamsfoundation.lams.tool.mc.dao.hibernate.McUserDAO;
 import org.lamsfoundation.lams.tool.mc.dao.hibernate.McUsrAttemptDAO;
+import org.lamsfoundation.lams.tool.mc.pojos.McContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McSession;
 
 /**
  * @author ozgurd
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml
===================================================================
diff -u -r8742c4d01b2ac066988448e0c64d76998d5f4f5b -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml	(.../McOptsContent.hbm.xml)	(revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml	(.../McOptsContent.hbm.xml)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -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
@@ -56,7 +56,7 @@
     <!-- 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 +77,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/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
diff -u -r25a3cd766f44f20c25042ad630f87b5b79a53671 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision 25a3cd766f44f20c25042ad630f87b5b79a53671)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -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/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	(.../McQueUsr.hbm.xml)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	(.../McQueUsr.hbm.xml)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -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/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml	(.../McSession.hbm.xml)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml	(.../McSession.hbm.xml)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -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/test/java/org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml
===================================================================
diff -u -r25a3cd766f44f20c25042ad630f87b5b79a53671 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml	(.../McUploadedFile.hbm.xml)	(revision 25a3cd766f44f20c25042ad630f87b5b79a53671)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml	(.../McUploadedFile.hbm.xml)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -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/test/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml	(.../McUsrAttempt.hbm.xml)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml	(.../McUsrAttempt.hbm.xml)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -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
@@ -35,9 +35,64 @@
     >
     </property>
 
+    <property
+        name="mark"
+        type="java.lang.Integer"
+        access="property"        
+        column="mark"
+    />
+
+    <property
+        name="passed"
+        type="boolean"
+        access="property"        
+        column="passed"
+        length="1"
+    />
+
+
+    <property
+        name="attemptCorrect"
+        type="boolean"
+        access="property"        
+        column="isAttemptCorrect"
+        length="1"
+    />
+
+    <property
+    name="attemptOrder"
+    type="java.lang.Integer"
+    access="property"        
+    column="attemptOrder"
+    />
+     
+     
+ 	<property
+        name="mcQueContentId"
+        type="java.lang.Long"
+        column="mc_que_content_id"
+        not-null="true"
+   	    update="false"
+	    insert="false"
+        length="20"
+    >
+    </property>
+     
+
+ 	<property
+        name="queUsrId"
+        type="java.lang.Long"
+        column="que_usr_id"
+        not-null="true"
+   	    update="false"
+	    insert="false"
+        length="20"
+    >
+    </property>
+
     <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"
@@ -50,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"
@@ -63,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"
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java
===================================================================
diff -u -rb729587d2ebffa80f02239e91bc80352869d311a -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	(.../TestMcContent.java)	(revision b729587d2ebffa80f02239e91bc80352869d311a)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	(.../TestMcContent.java)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -10,8 +10,6 @@
 package org.lamsfoundation.lams.tool.mc;
 
 
-import java.util.HashSet;
-
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 
 
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java
===================================================================
diff -u -r562680abb2d5566e7972f1ee4a1993fbbebc4ca9 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java	(.../TestMcOptionsContent.java)	(revision 562680abb2d5566e7972f1ee4a1993fbbebc4ca9)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java	(.../TestMcOptionsContent.java)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -12,7 +12,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent;
 
+
 /*
  * 
  * @author ozgurd
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java
===================================================================
diff -u -r735c5db341aaba22874662bf7e44ec91a24424c7 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java	(.../TestMcQueContent.java)	(revision 735c5db341aaba22874662bf7e44ec91a24424c7)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java	(.../TestMcQueContent.java)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -9,7 +9,6 @@
 
 package org.lamsfoundation.lams.tool.mc;
 
-import java.util.HashSet;
 
 
 /*
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java
===================================================================
diff -u -rf37b055d5a357bb4ac3ad938f04bf8f56ebcc772 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java	(.../TestMcQueUsr.java)	(revision f37b055d5a357bb4ac3ad938f04bf8f56ebcc772)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java	(.../TestMcQueUsr.java)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -11,7 +11,10 @@
 
 import java.util.HashSet;
 
+import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
+import org.lamsfoundation.lams.tool.mc.pojos.McSession;
 
+
 /**
  * This test is designed to test all service provided by SurveyQueUsr domain 
  * class
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java
===================================================================
diff -u -rb7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java	(.../TestMcSession.java)	(revision b7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java	(.../TestMcSession.java)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -9,9 +9,7 @@
 
 package org.lamsfoundation.lams.tool.mc;
 
-import java.util.Date;
-import java.util.HashSet;
-
+import org.lamsfoundation.lams.tool.mc.pojos.McSession;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 
 
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java
===================================================================
diff -u -r5f80d71e39cb040460d57e45cf7f94b34204f1b3 -r9219b0a1d1623f192568d6427be86e8c795b4b4a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java	(.../TestMcUsrAttempt.java)	(revision 5f80d71e39cb040460d57e45cf7f94b34204f1b3)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java	(.../TestMcUsrAttempt.java)	(revision 9219b0a1d1623f192568d6427be86e8c795b4b4a)
@@ -11,6 +11,10 @@
 
 import java.util.Date;
 
+import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
+import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;