Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r9f98b5e2b822f824d857d3d677f21b1149f794c8
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java	(.../ToolContentManager.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java	(.../ToolContentManager.java)	(revision 9f98b5e2b822f824d857d3d677f21b1149f794c8)
@@ -115,7 +115,7 @@
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId, int definitionType)
 	    throws ToolException;
 
-    public Class[] getSupportedToolOutputDefinitionClasses(int definitionType);
+    public Class<?>[] getSupportedToolOutputDefinitionClasses(int definitionType);
 
     /**
      * Finds title entered in the tool content.
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9f98b5e2b822f824d857d3d677f21b1149f794c8
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java	(.../ToolSessionManager.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java	(.../ToolSessionManager.java)	(revision 9f98b5e2b822f824d857d3d677f21b1149f794c8)
@@ -27,7 +27,6 @@
 import java.util.SortedMap;
 
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
-import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -92,7 +91,7 @@
      * @throws ToolException
      *             if any other error occurs
      */
-    ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException;
+    ToolSessionExportOutputData exportToolSession(List<Long> toolSessionIds) throws DataMissingException, ToolException;
 
     /**
      * Remove sesson data according specified the tool session id.
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r9f98b5e2b822f824d857d3d677f21b1149f794c8
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision 9f98b5e2b822f824d857d3d677f21b1149f794c8)
@@ -418,15 +418,15 @@
 	try {
 	    ToolContentManager contentManager = (ToolContentManager) findToolService(tool);
 
-	    Class[] supportedClasses = contentManager.getSupportedToolOutputDefinitionClasses(definitionType);
+	    Class<?>[] supportedClasses = contentManager.getSupportedToolOutputDefinitionClasses(definitionType);
 	    if (supportedClasses != null) {
 		Set<String> keysToRemove = new TreeSet<String>();
 		for (String key : definitions.keySet()) {
 		    ToolOutputDefinition value = definitions.get(key);
-		    Class valueClass = value.getValueClass();
+		    Class<?> valueClass = value.getValueClass();
 		    boolean matchFound = false;
 		    if (valueClass != null) {
-			for (Class supportedClass : supportedClasses) {
+			for (Class<?> supportedClass : supportedClasses) {
 			    // we take into account also superclasses
 			    if (supportedClass.isAssignableFrom(valueClass)) {
 				matchFound = true;
@@ -486,7 +486,7 @@
 
 	try {
 	    ToolSessionManager sessionManager = (ToolSessionManager) findToolService(tool);
-	    Long longLearnerId = learnerId != null ? new Long(learnerId.longValue()) : null;
+	    Long longLearnerId = learnerId != null ? learnerId.longValue() : null;
 	    return sessionManager.getToolOutput(conditionName, toolSession.getToolSessionId(), longLearnerId);
 	} catch (NoSuchBeanDefinitionException e) {
 	    String message = "A tool which is defined in the database appears to missing from the classpath. Unable to gt the tol output. toolSession "