Updated serialization
Updated embedded tomcat to clean up configuration