refactored eventing decoration