1. [+] Add filters
2. [+] Add listener on all collections
3. [-] Remove old code