Updated trigger handling to make use of the message frequency information