Added ability to annotate events with both a from and a to address