Servlet improvements