Change to Servlet 3.0