Updated to support tomcat 7.0.50