Infrastructure for trigger 1 added