Fixed param names and add tomcat library defaults