Added filters and set up rules