Tomcat 7 support