Provide better handling of passing the context.