EventRelay.set refactored