Added support for filtering!