Updated to Tomcat 7