Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java
===================================================================
diff -u -r42e6c9c7220f8baf3b245d73b57aca9be08191ea -rf5e6ce9d7ae0454374cec1349c170dbec5cea536
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java	(.../DAO.java)	(revision 42e6c9c7220f8baf3b245d73b57aca9be08191ea)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java	(.../DAO.java)	(revision f5e6ce9d7ae0454374cec1349c170dbec5cea536)
@@ -26,13 +26,15 @@
 import java.io.Serializable;
 import java.util.List;
 
+import org.lamsfoundation.lams.dao.IBaseDAO;
+
 /**
  * Data Access Object (DAO) interface. This is an interface used to tag our DAO classes and to provide common methods to
  * all DAOs.
  *
  * @author Andrey Balan
  */
-public interface DAO {
+public interface DAO extends IBaseDAO {
 
     /**
      * Generic method used to get all objects of a particular type. This is the same as lookup up all rows in a table.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -rf5e6ce9d7ae0454374cec1349c170dbec5cea536
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision f5e6ce9d7ae0454374cec1349c170dbec5cea536)
@@ -477,7 +477,7 @@
 	    }
 	}
 
-	assessmentResultDao.saveObject(result);
+	assessmentResultDao.insert(result);
     }
 
     /*
@@ -572,7 +572,7 @@
 	    result.setMaximumGrade(maximumGrade);
 	    result.setGrade(grade);
 	    result.setFinishDate(new Timestamp(new Date().getTime()));
-	    assessmentResultDao.saveObject(result);
+	    assessmentResultDao.update(result);
 	}
 
 	return true;
@@ -2373,22 +2373,23 @@
     @Override
     public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) {
 	AssessmentUser learner = getUserByIDAndSession(learnerId, toolSessionId);
-	if ( learner == null ) {
+	if (learner == null) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null);
-	} 
-	
+	}
+
 	Assessment assessment = getAssessmentBySessionId(toolSessionId);
-	List<AssessmentResult> results = assessmentResultDao.getAssessmentResults(assessment.getUid(), learner.getUserId());
+	List<AssessmentResult> results = assessmentResultDao.getAssessmentResults(assessment.getUid(),
+		learner.getUserId());
 	Date startDate = null;
 	Date finishDate = null;
-	for ( AssessmentResult result: results ) {
-	    if ( startDate == null || ( result.getStartDate()  != null && result.getStartDate().before(startDate)) )
+	for (AssessmentResult result : results) {
+	    if (startDate == null || (result.getStartDate() != null && result.getStartDate().before(startDate)))
 		startDate = result.getStartDate();
-	    if ( finishDate == null || ( result.getFinishDate()  != null && result.getFinishDate().after(finishDate)) )
+	    if (finishDate == null || (result.getFinishDate() != null && result.getFinishDate().after(finishDate)))
 		finishDate = result.getFinishDate();
 	}
 
-	if ( learner.isSessionFinished()  )
+	if (learner.isSessionFinished())
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, finishDate);
 	else
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null);