Refactory DumpEventSource to EventSourceUtil