Updated for use with the new mysql features in tomcat module