Added ability to collect attributes when an event triggered