Rewriting triggers to reflect new single payload strategy.