Trigger improvements