Use mutable dictionary so timestamp can be added when an event is published
Revert "Use mutable dictionary so timestamp can be added when an event is published"

This reverts commit 8fbbbe6f13cc7dd204efe4e4f7b75672672bc2b4.