Adding tomcat compatibility