* Add filtering to TriggerContextCollector * Add all predefined variable to ANY triggers * Make variable names consistent with event types