Retrofitted with ContextManager pattern