Addind filtering capabilities