refactor of trigger data handling so that custom data from within the prehook becomes available in trigger data. It was also needed to add a hook for altering trigger data