Refactoring Tomcat to use Attributes

Complete and Continue