Refactored logging to use event-stream