modified tomcat classes