Updating EventGraph to be Immutable