ContextListener.java edits