Add tomcat8 support