Rework EventSubscribers