Events\Logging improvements