I implemented it while working on the logging_client_events, but this may be applicable in other parts
I implemented it while working on the logging_client_events, but this may be applicable in other parts