Migrate to Servlet 3.0