Add basic filtering support