Add mechanism for filtering