Updated to ContextManager to support derived - incomplete