Add Tomcat 8 support