A better way to inject servletContext, and updated config files