Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
===================================================================
diff -u -rf3a234b1e836f365e9489c5cc0f0ab62ddc6776b -r38ecd818601a51114038b21f2ec0190aa679f7e6
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	(.../IMcOptionsContentDAO.java)	(revision f3a234b1e836f365e9489c5cc0f0ab62ddc6776b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	(.../IMcOptionsContentDAO.java)	(revision 38ecd818601a51114038b21f2ec0190aa679f7e6)
@@ -35,11 +35,17 @@
 	
 	public McOptionsContent findMcOptionsContentById(Long mcQueOptionId);
 	
- 	public McOptionsContent getMcOptionById(long mcQueOptionId);
-
-	public void createOptionsContent(McOptionsContent mcOptionsContent); 
+	public void saveMcOptionsContent(McOptionsContent mcOptionsContent);
     
-	public void removeOptionsContent(long mcQueOptionId);
+	public void updateMcOptionsContent(McOptionsContent mcOptionsContent);
+
+	public void removeMcOptionsContentByUID(Long uid);
+	
+	public void removeMcOptionsContent(Long mcQueOptionId);
+
+	public void removeMcOptionsContentById(Long mcQueOptionId);
+	
+	public void removeMcOptionsContent(McOptionsContent mcOptionsContent);
         
 }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java
===================================================================
diff -u -rd5c5282b3010b7ca8605cfa64012c5ecff95880e -r38ecd818601a51114038b21f2ec0190aa679f7e6
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java	(.../IMcSessionDAO.java)	(revision d5c5282b3010b7ca8605cfa64012c5ecff95880e)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java	(.../IMcSessionDAO.java)	(revision 38ecd818601a51114038b21f2ec0190aa679f7e6)
@@ -28,31 +28,32 @@
 
 
 /**
- * <p>Interface for the NoticeboardSession DAO, defines methods needed to access/modify
+ * <p>Interface for the McSession DAO, defines methods needed to access/modify
  * mc session</p>
  * @author ozgurd
  */
 public interface IMcSessionDAO {
 	
-   
+	/**
+	 * <p>Return the persistent instance of a McSession  
+	 * with the given identifier <code>uid</code>, returns null if not found. </p>
+	 * 
+	 * @param uid an identifier for the McSession object.
+	 * @return the persistent instance of a McSession or null if not found
+	 */
+	
+    public McSession getMcSessionByUID(Long uid);
+    
     /**
-	 * <p> Return the persistent instance of a NoticeboardSession
+	 * <p> Return the persistent instance of a McSession
 	 * with the given tool session id <code>mcSessionId</code>,
 	 * returns null if not found.</p>
 	 * 
 	 * @param mcSessionId The tool session id
-	 * @return the persistent instance of a NoticeboardSession or null if not found.
+	 * @return the persistent instance of a McSession or null if not found.
 	 */
     public McSession findMcSessionById(Long mcSessionId);
 	
-    /**
-	 * <p>Return the persistent instance of a McSession  
-	 * with the given identifier <code>uid</code>, returns null if not found. </p>
-	 * 
-	 * @param uid an identifier for the McSession object.
-	 * @return the persistent instance of a McSession or null if not found
-	 */
-    public McSession getMcSessionByUID(Long uid);
 	
 	
     /**
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
===================================================================
diff -u -rf3a234b1e836f365e9489c5cc0f0ab62ddc6776b -r38ecd818601a51114038b21f2ec0190aa679f7e6
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java	(.../McOptionsContentDAO.java)	(revision f3a234b1e836f365e9489c5cc0f0ab62ddc6776b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java	(.../McOptionsContentDAO.java)	(revision 38ecd818601a51114038b21f2ec0190aa679f7e6)
@@ -8,6 +8,8 @@
 
 import java.util.List;
 
+import net.sf.hibernate.Hibernate;
+
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.mc.McOptionsContent;
 import org.lamsfoundation.lams.tool.mc.dao.IMcOptionsContentDAO;
@@ -32,7 +34,7 @@
 		
 		public McOptionsContent findMcOptionsContentById(Long mcQueOptionId)
 		{
-		    String query = "from McOptionsContent as mco where mco.mcContentId = ?";
+		    String query = "from McOptionsContent as mco where mco.mcQueOptionId = ?";
 			List content = getHibernateTemplate().find(query,mcQueOptionId);
 				
 			if(content!=null && content.size() == 0)
@@ -46,19 +48,46 @@
 		
 		}
 		
-	 	public McOptionsContent getMcOptionById(long mcQueOptionId)
-	 	{
-	 		return (McOptionsContent) this.getHibernateTemplate().load(McOptionsContent.class, new Long(mcQueOptionId));
-	 	}
-	 	
-		public void createOptionsContent(McOptionsContent mcOptionsContent) 
+		
+		public void saveMcOptionsContent(McOptionsContent mcOptionsContent)
 	    {
 	    	this.getHibernateTemplate().save(mcOptionsContent);
 	    }
+	    
+		public void updateMcOptionsContent(McOptionsContent mcOptionsContent)
+	    {
+	    	this.getHibernateTemplate().update(mcOptionsContent);
+	    }
 		
-		public void removeOptionsContent(long mcQueOptionId) 
+		
+		public void removeMcOptionsContentByUID(Long uid)
 	    {
-			McOptionsContent mcQueContent= (McOptionsContent) this.getHibernateTemplate().load(McOptionsContent.class, new Long(mcQueOptionId));
-	    	this.getHibernateTemplate().delete(mcQueContent);
+			McOptionsContent mco = (McOptionsContent)getHibernateTemplate().get(McOptionsContent.class, uid);
+	    	this.getHibernateTemplate().delete(mco);
 	    }
+		
+		
+		public void removeMcOptionsContent(Long mcQueOptionId)
+	    {
+	       String query = "from McOptionsContent as mco where mco.mcQueOptionId=";
+	       StringBuffer sb = new StringBuffer(query);
+	       sb.append(mcQueOptionId.longValue());
+	       String queryString = sb.toString();
+	          
+	       this.getHibernateTemplate().delete(queryString);
+	    }
+	
+		public void removeMcOptionsContentById(Long mcQueOptionId)
+	    {
+	        String query = "from mco in class org.lamsfoundation.lams.tool.mc.McOptionsContent"
+	        + " where mcq.mcQueOptionId = ?";
+	        this.getHibernateTemplate().delete(query,mcQueOptionId,Hibernate.LONG);
+	    }
+		
+		
+		public void removeMcOptionsContent(McOptionsContent mcOptionsContent)
+	    {
+	        this.getHibernateTemplate().delete(mcOptionsContent);
+	    }
+		
 } 
\ No newline at end of file