Upgrade to tomcat plugin