Adding tomcat 8 support