added tomcat support
removed import