Added events and removed instance_filter