Added support for Servlet 3.1