replaced servletContext for serverContext