Made tomcat build more generic