Migrated to Java7 & Tomcat8