Updating to new Servlet model