Changed configuration to use ServletContext