Use a ContextManager instead of current functions
Use a ContextManager instead of current functions