Adding ability to filter