Finish generic parameterized triggers, and removed object paramter for trigger