Fix up interaction with triggeragents by allowing a message param