Changing client with_context API