Modified EventSink/EventFormatter to account for Source

Modified EventSink/EventFormatter to account for Source