Upgraded to Tomcat for Java8 Support