Modified the way trigger data was created and handled.