Add Filter and Trigger class