Moved to Tomcat 7