Another refactor of ContextManager leftover missed