Added filtering capabilities