Add tomcat support