Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -r40c616804a17ba3c8bf814f24520fbd26bf6541e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 40c616804a17ba3c8bf814f24520fbd26bf6541e)
@@ -84,7 +84,7 @@
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtToolContentHandler;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
+import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator;
 import org.lamsfoundation.lams.util.DateUtil;
@@ -103,7 +103,7 @@
 	private ISubmitFilesSessionDAO submitFilesSessionDAO;
 	private ISubmissionDetailsDAO submissionDetailsDAO;
 	private ILearnerDAO learnerDAO;
-	private IUserDAO userDAO;
+	private IBaseDAO baseDAO;
 	
 	private IToolContentHandler sbmtToolContentHandler;
 	private ILamsToolService toolService;
@@ -647,7 +647,7 @@
 		Iterator iterator = users.iterator();
 		while(iterator.hasNext()){
 			Long userID = (Long)iterator.next();			
-			User user = userDAO.getUserById(new Integer(userID.intValue()));
+			User user = (User)baseDAO.find(User.class,userID.intValue());
 			table.add(user.getUserDTO());
 		}
 		return table;
@@ -662,7 +662,7 @@
 		}
 	}
 	public UserDTO getUserDetails(Long userID){
-		User user = userDAO.getUserById(new Integer(userID.intValue()));
+		User user = (User)baseDAO.find(User.class,userID.intValue());
 		if(user == null)
 			return null;
 		
@@ -820,10 +820,10 @@
 	}
 	
 	/**
-	 * @param userDAO The userDAO to set.
+	 * @param baseDAO The baseDAO to set.
 	 */
-	public void setUserDAO(IUserDAO userDAO) {
-		this.userDAO = userDAO;
+	public void setBaseDAO(IBaseDAO baseDAO) {
+		this.baseDAO = baseDAO;
 	}
 
 	/**
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -r2544e101518962e76f9a225bf2ba77eb1422b64c -r40c616804a17ba3c8bf814f24520fbd26bf6541e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 2544e101518962e76f9a225bf2ba77eb1422b64c)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 40c616804a17ba3c8bf814f24520fbd26bf6541e)
@@ -51,7 +51,7 @@
 		<property name="submissionDetailsDAO"><ref bean="submissionDetailsDAO"/></property>
 		<property name="learnerDAO"><ref bean="learnerDAO"/></property>
 		<property name="sbmtToolContentHandler"><ref bean="sbmtToolContentHandler"/></property>
-		<property name="userDAO"><ref bean="userDAO"/></property>
+		<property name="baseDAO"><ref bean="baseDAO"/></property>
 		<property name="learnerService"><ref bean="learnerService"/></property>
 		<property name="toolService"><ref bean="lamsToolService"/></property>
 		<property name="exportContentService"><ref bean="exportToolContentService"/></property>