Trigger matching producer changed to run on the Valid* objects