Simple filtering capabilities added