diff --git a/pom.xml b/pom.xml
index 20012b32..6b467bb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,9 +77,9 @@
 			<plugin>
 				<groupId>org.apache.openejb.maven</groupId>
 				<artifactId>tomee-maven-plugin</artifactId>
-				<version>1.5.2</version>
+				<version>1.6.0</version>
 				<configuration>
-					<tomeeVersion>1.5.2</tomeeVersion>
+					<tomeeVersion>1.6.0</tomeeVersion>
 					<tomeeClassifier>plus</tomeeClassifier>
 					<tomeeHttpPort>8082</tomeeHttpPort>
 					<args>-Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled</args>
@@ -104,6 +104,7 @@
 						<lib>org.hibernate.common:hibernate-commons-annotations:4.0.1.Final</lib>
 						<lib>org.hibernate:hibernate-validator:4.3.1.Final</lib>
 						<lib>org.jboss.logging:jboss-logging:3.1.3.GA</lib>
+						<lib>org.javassist:javassist:3.15.0-GA</lib>
 
 						<lib>dom4j:dom4j:1.6.1</lib>
 						<lib>antlr:antlr:2.7.7</lib>
@@ -238,9 +239,9 @@
 			<version>1.8</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-collections4</artifactId>
-			<version>4.0</version>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
index c6664a1c..a809d2b5 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
@@ -15,7 +15,7 @@ import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
diff --git a/src/main/java/com/commafeed/backend/opml/OPMLImporter.java b/src/main/java/com/commafeed/backend/opml/OPMLImporter.java
index 7e5b5a7d..dffa7780 100644
--- a/src/main/java/com/commafeed/backend/opml/OPMLImporter.java
+++ b/src/main/java/com/commafeed/backend/opml/OPMLImporter.java
@@ -11,7 +11,7 @@ import javax.inject.Inject;
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.commafeed.backend.cache.CacheService;
diff --git a/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java b/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java
index 8a38848e..45995237 100644
--- a/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java
+++ b/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java
@@ -2,7 +2,7 @@ package com.commafeed.backend.rome;
 
 import java.util.List;
 
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;
diff --git a/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java b/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
index fcc5ccfc..571413ba 100755
--- a/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
+++ b/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.request.flow.RedirectToUrlException;
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
index 8abc89ff..0d774075 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
@@ -21,7 +21,7 @@ import javax.ws.rs.core.Response.Status;
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
 
diff --git a/src/main/webapp/WEB-INF/scan.xml b/src/main/webapp/WEB-INF/scan.xml
index 03dfadcd..07374787 100644
--- a/src/main/webapp/WEB-INF/scan.xml
+++ b/src/main/webapp/WEB-INF/scan.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <scan>
 	<packages>
-		<package>com.commafeed</package>
+		<package>com.commafeed.backend</package>
+		<package>com.commafeed.frontend.rest</package>
 	</packages>
 </scan>
\ No newline at end of file