Close #22 - Tomcat class should be rethought.