Refactoring Notifications. Using the event ObjectID as notification identifier simplifies things a lot