Adding support for Tomcat8